polystring localization fix

Evolveum · Dec 10, 2019 · c883636 · c883636
1 parent 36d59e6
commit c883636
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -1101,6 +1101,13 @@ public static String getTranslatedPolyString(PolyStringType value){
 
     public static String getTranslatedPolyString(PolyString value){
         MidPointApplication application = MidPointApplication.get();
+        return getTranslatedPolyString(value, application);
+    }
+
+    public static String getTranslatedPolyString(PolyString value, MidPointApplication application){
+        if (value == null){
+            return "";
+        }
         return application.getLocalizationService().translate(value, getCurrentLocale(), true);
     }
 
@@ -1388,8 +1395,19 @@ public static String getDisplayName(PrismObject object) {
     }
 
     public static String getDisplayName(PrismObject object, boolean translate) {
+        return getDisplayName(object, translate, null);
+    }
+
+    public static String getDisplayName(PrismObject object, boolean translate, MidPointApplication application) {
+        if (object == null){
+            return  "";
+        }
         if (translate){
-            return getTranslatedPolyString(ObjectTypeUtil.getDisplayName(object));
+            if (application == null) {
+                return getTranslatedPolyString(ObjectTypeUtil.getDisplayName(object));
+            } else {
+                return getTranslatedPolyString(PolyString.toPolyString(ObjectTypeUtil.getDisplayName(object)), application);
+            }
         } else {
             return PolyString.getOrig(ObjectTypeUtil.getDisplayName(object));
         }