Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Apr 16, 2020 · eea3573 · eea3573
2 parents 3a1000d + aefe294
commit eea3573
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
@@ -235,7 +235,10 @@ public String translate(PolyString polyString, Locale locale, boolean allowOrig)
             }
         }
         if (polyString.getTranslation() != null) {
-            return translate(polyString.getTranslation(), locale);
+            String value = translate(polyString.getTranslation(), locale);
+            if (value != null){
+                return value;
+            }
         }
         if (allowOrig) {
             return polyString.getOrig();