adding localization of new keys MID-5389

Evolveum · Jun 13, 2019 · 0211608 · 0211608
1 parent 106efd7
commit 0211608
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismObjectValueWrapperImpl.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismObjectValueWrapperImpl.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.wicket.model.StringResourceModel;
+
 import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.api.prism.PrismObjectWrapper;
@@ -52,7 +54,7 @@ public <T extends Containerable> List<PrismContainerWrapper<T>> getContainers()
 
 	@Override
 	public String getDisplayName() {
-		return "prismContainer.mainPanelDisplayName";
+		return new StringResourceModel("prismContainer.mainPanelDisplayName").getString();
 	}
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -27,6 +27,7 @@
 import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
 import org.apache.wicket.util.time.Duration;
@@ -144,16 +145,18 @@ protected void onTimer(AjaxRequestTarget target) {
 
 	@Override
 	protected IModel<String> createPageTitleModel() {
+		String simpleName = getCompileTimeClass().getSimpleName();
+		String lokalizedSimpleName = new StringResourceModel("ObjectType." + simpleName).setDefaultValue(simpleName).getString();
 		if (isAdd()) {
-			return createStringResource("PageAdminObjectDetails.title.new", getCompileTimeClass().getSimpleName());
+			return createStringResource("PageAdminObjectDetails.title.new", lokalizedSimpleName);
 		}
 
 		String name = null;
 		if (getObjectWrapper() != null && getObjectWrapper().getObject() != null) {
 			name = WebComponentUtil.getName(getObjectWrapper().getObject());
 		}
 
-		return createStringResource("PageAdminObjectDetails.title.edit.readonly.${readOnly}", getObjectModel(), name);
+		return createStringResource("PageAdminObjectDetails.title.edit.readonly.${readOnly}", getObjectModel(), lokalizedSimpleName, name);
 	}
 
 	private boolean isAdd() {

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1193,6 +1193,9 @@ PageAdmin.menu.top.cases.myManualProvisionCases=My manual provision cases
 pageAdmin.reports.description=Exporting reports
 pageAdmin.reports=Reports
 PageAdmin.menu.top.users.requestAssign=Request Assignment
+PageAdminObjectDetails.title.new=Create new {0}
+PageAdminObjectDetails.title.edit.readonly.false=Edit {0} '{1}'
+PageAdminObjectDetails.title.edit.readonly.true=View {0} '{1}'
 PageAdminObjectDetails.title.editUserType=Edit user '{0}'
 PageAdminObjectDetails.title.viewUserType=View user '{0}'
 PageAdminObjectDetails.title.newUserType=Create new user