From 87cf8b64dfb6df3fe39562700af4ac508c660ac1 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Thu, 16 Apr 2020 13:34:16 +0200
Subject: [PATCH] polystring translate fix

---
 .../evolveum/midpoint/common/LocalizationServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 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
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();