From c88363620779f9c0ad9d6072e0b20a47a23cf32a Mon Sep 17 00:00:00 2001 From: kate Date: Tue, 10 Dec 2019 21:54:04 +0100 Subject: [PATCH] polystring localization fix --- .../gui/api/util/WebComponentUtil.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 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 index aa65546e564..52fcfdddc37 100644 --- 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)); }