Merge remote-tracking branch 'origin/master'

Evolveum · May 26, 2016 · a8da756 · a8da756
2 parents 17de0a2 + abd5290
commit a8da756
Show file tree

Hide file tree

Showing 6 changed files with 785 additions and 659 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -35,6 +35,7 @@
 
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
 import com.evolveum.midpoint.repo.api.RepositoryService;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.wf.api.WorkflowManager;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.io.IOUtils;
@@ -243,6 +244,7 @@ public void init() {
 
         List<IStringResourceLoader> resourceLoaders = resourceSettings.getStringResourceLoaders();
         resourceLoaders.add(0, new Utf8BundleStringResourceLoader("localization/Midpoint"));
+        resourceLoaders.add(1, new Utf8BundleStringResourceLoader(SchemaConstants.SCHEMA_LOCALIZATION_PROPERTIES_RESOURCE_BASE_PATH));
 
         resourceSettings.setThrowExceptionOnMissingResource(false);
         getMarkupSettings().setStripWicketTags(true);
@@ -460,13 +462,6 @@ public ModelInteractionService getModelInteractionService() {
         return modelInteractionService;
     }
 
-    public String getString(String key) {
-        ResourceSettings resourceSettings = getResourceSettings();
-        List<IStringResourceLoader> resourceLoaders = resourceSettings.getStringResourceLoaders();
-        IStringResourceLoader loader = resourceLoaders.get(0);
-        return loader.loadStringResource((Class) null, key, null, null, null);
-    }
-
     public static boolean containsLocale(Locale locale) {
         if (locale == null) {
             return false;