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 index dd232bbd877..2f6da999421 100644 --- 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();