Fix fallback mechanism for ICU translations (pimcore#17057)

michalananapps · Oct 4, 2024 · 84d9f9f · 84d9f9f
1 parent 40d5554
commit 84d9f9f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Translation/Translator.php b/lib/Translation/Translator.php
@@ -285,10 +285,11 @@ private function checkForEmptyTranslation(string $id, string $translated, array
                 }
 
                 if ($fallbackValue && $normalizedId != $fallbackValue) {
+                    $isIntl = $catalogue->defines($normalizedId, $domain . $catalogue::INTL_DOMAIN_SUFFIX);
                     // update fallback value in original catalogue otherwise multiple calls to the same id will not work
-                    $this->getCatalogue($locale)->set($normalizedId, $fallbackValue, $domain);
+                    $this->getCatalogue($locale)->set($normalizedId, $fallbackValue, $domain . ($isIntl ? $catalogue::INTL_DOMAIN_SUFFIX : ''));
 
-                    return strtr($fallbackValue, $parameters);
+                    return $this->translator->trans($normalizedId, $parameters, $domain, $locale);
                 }
             }
         }