#27448 Removing the language label as can also be calculated from the…

… ISO code
dotCMS · Apr 10, 2024 · 80fc192 · 80fc192
1 parent 43edc62
commit 80fc192
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/...s/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/language/AbstractLanguage.java b/...s/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/language/AbstractLanguage.java
@@ -36,7 +36,7 @@ default String dotCMSObjectType() {
     @JsonView({LanguageReadView.class, LanguageWriteView.class})
     Optional<String> countryCode();
 
-    @JsonView({LanguageFileView.class, LanguageReadView.class, LanguageWriteView.class})
+    @JsonView({LanguageReadView.class, LanguageWriteView.class})
     Optional<String> language();
 
     @JsonView({LanguageReadView.class, LanguageWriteView.class})

diff --git a/...dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguagePullHandler.java b/...dotcms-cli/cli/src/main/java/com/dotcms/api/client/pull/language/LanguagePullHandler.java
@@ -38,9 +38,7 @@ public String fileName(final Language language) {
     public String shortFormat(final Language language, final PullOptions pullOptions) {
 
         return String.format(
-                "language: [@|bold,underline,blue %s|@] "
-                        + "isoCode: [@|bold,yellow %s|@]",
-                language.language().orElse(""),
+                "isoCode: [@|bold,yellow %s|@]",
                 language.isoCode()
         );
     }

diff --git a/.../dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageComparator.java b/.../dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguageComparator.java
@@ -4,7 +4,6 @@
 import com.dotcms.model.language.Language;
 import java.io.File;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import javax.annotation.Nullable;
 import javax.enterprise.context.Dependent;
@@ -86,9 +85,7 @@ private boolean equals(@Nullable Language toCompare, @Nullable Language another)
             return false;
         }
 
-        return Objects.equals(
-                toCompare.language().orElse(""), another.language().orElse("")
-        ) && toCompare.isoCode().equalsIgnoreCase(another.isoCode());
+        return toCompare.isoCode().equalsIgnoreCase(another.isoCode());
     }
 
     /**

diff --git a/...dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguagePushHandler.java b/...dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/language/LanguagePushHandler.java
@@ -115,6 +115,10 @@ private Language setMissingValues(Language localLanguage,
                     matchingServerLanguage.get().defaultLanguage());
         }
 
+        if (localLanguage.language().isEmpty() && matchingServerLanguage.isPresent()) {
+            localLanguage = localLanguage.withLanguage(matchingServerLanguage.get().language());
+        }
+
         final String isoCode = localLanguage.isoCode();
         if (localLanguage.languageCode().isEmpty()) {
             localLanguage = localLanguage.withLanguageCode(isoCode.split("-")[0]);