Update LanguageService.java (#992)

Update LanguageService.java _ Handle GUI test
axonivy-market · Aug 28, 2024 · 22ef594 · 22ef594
1 parent 0ade5ec
commit 22ef594
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/LanguageService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/LanguageService.java
@@ -61,7 +61,11 @@ public IvyLanguage getIvyLanguageOfUser() {
   }
 
   public String getUserLanguage() {
-    return loadLanguage(IUser::getLanguage);
+    String languageTag = loadLanguage(IUser::getLanguage);
+    if (languageTag == StringUtils.EMPTY) {
+    return getDefaultLanguage().toLanguageTag();
+    }
+    return languageTag;
   }
 
   public String getUserFormatLanguage() {
@@ -75,9 +79,7 @@ private String loadLanguage(Function<IUser, Locale> userLocaleLoader) {
     } else {
       Locale apply = userLocaleLoader.apply(Ivy.session().getSessionUser());
       languageTag = Objects.nonNull(apply) ? apply.toLanguageTag() : languageTag;
-      if (languageTag == StringUtils.EMPTY) {
-        return getDefaultLanguage().toLanguageTag();
-      }
+
     }
     return languageTag;
   }