diff --git a/core/src/main/java/org/apache/hop/i18n/GlobalMessageUtil.java b/core/src/main/java/org/apache/hop/i18n/GlobalMessageUtil.java index 95038b9eae6..05e661c3848 100644 --- a/core/src/main/java/org/apache/hop/i18n/GlobalMessageUtil.java +++ b/core/src/main/java/org/apache/hop/i18n/GlobalMessageUtil.java @@ -263,14 +263,23 @@ public static String calculateString( final boolean fallbackOnRoot) { final Set activeLocales = getActiveLocales(); + boolean foundEmpty = false; for (final Locale locale : activeLocales) { final String string = calculateString( pkgNames, locale, key, parameters, resourceClass, bundleName, fallbackOnRoot); + if (string != null && string.isEmpty()) { + // An empty value is an untranslated key (Weblate writes those): try the next locale. + foundEmpty = true; + continue; + } if (!isMissingKey(string)) { return string; } } + if (foundEmpty) { + return ""; + } if (logNotFoundError) { final StringBuilder msg = new StringBuilder(); msg.append("Message not found in the preferred and failover locale: key=[") @@ -290,15 +299,22 @@ private static String calculateString( final Class resourceClass, final String bundleName, final boolean fallbackOnRoot) { + String empty = null; for (final String packageName : pkgNames) { try { - return calculateString( - packageName, locale, key, parameters, resourceClass, bundleName, fallbackOnRoot); + final String string = + calculateString( + packageName, locale, key, parameters, resourceClass, bundleName, fallbackOnRoot); + if (!string.isEmpty()) { + return string; + } + // Untranslated in this package: another package may still have a translation. + empty = string; } catch (final MissingResourceException e) { continue; } } - return null; + return empty; } static String calculateString( diff --git a/core/src/test/java/org/apache/hop/i18n/GlobalMessageUtilTest.java b/core/src/test/java/org/apache/hop/i18n/GlobalMessageUtilTest.java index 3c38655bc85..ad5afce9c5e 100644 --- a/core/src/test/java/org/apache/hop/i18n/GlobalMessageUtilTest.java +++ b/core/src/test/java/org/apache/hop/i18n/GlobalMessageUtilTest.java @@ -212,4 +212,45 @@ void calculateString() { GlobalMessages.PKG, GlobalMessages.BUNDLE_NAME)); } + + @Test + void emptyTranslationFallsBackToTheNextLocale() { + // messages_fr_FR has "emptyKey=", the way Weblate writes an untranslated key + LanguageChoice.getInstance().setDefaultLocale(Locale.FRANCE); + assertEquals( + "Empty in French foo", + GlobalMessageUtil.calculateString( + new String[] {GlobalMessages.SYSTEM_BUNDLE_PACKAGE}, + "emptyKey", + new String[] {"foo"}, + GlobalMessages.PKG, + GlobalMessages.BUNDLE_NAME)); + } + + @Test + void emptyTranslationFallsBackToTheNextPackageFirst() { + // empty in i18n/messages_fr_FR, translated in foo/messages_fr + LanguageChoice.getInstance().setDefaultLocale(Locale.FRANCE); + assertEquals( + "Traduit dans foo foo", + GlobalMessageUtil.calculateString( + new String[] {GlobalMessages.SYSTEM_BUNDLE_PACKAGE, "org.apache.hop.foo"}, + "emptyInFrenchOnly", + new String[] {"foo"}, + GlobalMessages.PKG, + GlobalMessages.BUNDLE_NAME)); + } + + @Test + void keyThatIsEmptyEverywhereStaysEmpty() { + LanguageChoice.getInstance().setDefaultLocale(Locale.FRANCE); + assertEquals( + "", + GlobalMessageUtil.calculateString( + new String[] {GlobalMessages.SYSTEM_BUNDLE_PACKAGE}, + "alwaysEmpty", + new String[] {}, + GlobalMessages.PKG, + GlobalMessages.BUNDLE_NAME)); + } } diff --git a/core/src/test/resources/org/apache/hop/foo/messages/messages_fr.properties b/core/src/test/resources/org/apache/hop/foo/messages/messages_fr.properties index 59fc6f11a08..228c0be06a3 100644 --- a/core/src/test/resources/org/apache/hop/foo/messages/messages_fr.properties +++ b/core/src/test/resources/org/apache/hop/foo/messages/messages_fr.properties @@ -19,3 +19,4 @@ # someKey=Une certaine valeur {0} +emptyInFrenchOnly=Traduit dans foo {0} diff --git a/core/src/test/resources/org/apache/hop/i18n/messages/messages.properties b/core/src/test/resources/org/apache/hop/i18n/messages/messages.properties index e07acdfb15a..4bce5e0a5f0 100644 --- a/core/src/test/resources/org/apache/hop/i18n/messages/messages.properties +++ b/core/src/test/resources/org/apache/hop/i18n/messages/messages.properties @@ -19,3 +19,6 @@ # someKey=Some Value {0} +emptyKey=Empty in French {0} +alwaysEmpty= +emptyInFrenchOnly=Only in English {0} diff --git a/core/src/test/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties b/core/src/test/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties index 59fc6f11a08..403d4db3772 100644 --- a/core/src/test/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties +++ b/core/src/test/resources/org/apache/hop/i18n/messages/messages_fr_FR.properties @@ -19,3 +19,5 @@ # someKey=Une certaine valeur {0} +emptyKey= +emptyInFrenchOnly=