summary panel messages localization

Evolveum · Dec 4, 2019 · 31b2bd4 · 31b2bd4
1 parent 4a2a7fb
commit 31b2bd4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
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
@@ -1108,7 +1108,12 @@ public static <O extends ObjectType> String getName(ObjectReferenceType ref, Pag
     }
 
     public static <O extends ObjectType> String getDisplayNameOrName(ObjectReferenceType ref, PageBase pageBase, String operation) {
-        String name = getName(ref);
+        return getDisplayNameOrName(ref, pageBase, operation, false);
+    }
+
+    public static <O extends ObjectType> String getDisplayNameOrName(ObjectReferenceType ref, PageBase pageBase,
+                                                                     String operation, boolean translate) {
+        String name = getName(ref, translate);
         if (StringUtils.isEmpty(name) || name.equals(ref.getOid())) {
             String oid = ref.getOid();
             Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions
@@ -1117,7 +1122,7 @@ public static <O extends ObjectType> String getDisplayNameOrName(ObjectReference
             PrismObject<O> object = WebModelServiceUtils.loadObject(type, oid, pageBase,
                     pageBase.createSimpleTask(operation), new OperationResult(operation));
             if (object != null) {
-                name = getDisplayNameOrName(object);
+                name = getDisplayNameOrName(object, true);
             }
         }
         return name;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseSummaryPanel.java
@@ -42,7 +42,7 @@ protected IModel<String> getTitleModel() {
         ObjectReferenceType parentRef = getModelObject().getParentRef();
         if (parentRef != null && StringUtils.isNotEmpty(parentRef.getOid())) {
             return createStringResource("CaseSummaryPanel.parentCase",
-                    WebComponentUtil.getDisplayNameOrName(getModelObject().getParentRef(), getPageBase(), OPERATION_LOAD_PARENT_CASE_DISPLAY_NAME));
+                    WebComponentUtil.getDisplayNameOrName(getModelObject().getParentRef(), getPageBase(), OPERATION_LOAD_PARENT_CASE_DISPLAY_NAME, true));
         } else {
             return null;
         }

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/workflow/CaseWorkItemSummaryPanel.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/workflow/CaseWorkItemSummaryPanel.java
@@ -121,8 +121,8 @@ public String getObject() {
                     return getString("TaskSummaryPanel.requestedBy", getString("TaskSummaryPanel.unknown"));
                 }
 
-                String displayName = WebComponentUtil.getDisplayName(requester);
-                String name = WebComponentUtil.getName(requester);
+                String displayName = WebComponentUtil.getDisplayName(requester, true);
+                String name = WebComponentUtil.getName(requester, true);
                 if (displayName != null) {
                     return getString("TaskSummaryPanel.requestedByWithFullName", displayName, name);
                 } else {