This is an automated email from the ASF dual-hosted git repository.
bamaer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new f7ad97c1d8 Untranslated strings from Weblate show up as blank labels,
fixes #9502 (#9504)
f7ad97c1d8 is described below
commit f7ad97c1d8a92c7288b4c19b877d1f4fba40543d
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Mon Nov 16 20:42:35 2026 +0100
Untranslated strings from Weblate show up as blank labels, fixes #9502
(#9504)
---
.../org/apache/hop/i18n/GlobalMessageUtil.java | 22 ++++++++++--
.../org/apache/hop/i18n/GlobalMessageUtilTest.java | 41 ++++++++++++++++++++++
.../apache/hop/foo/messages/messages_fr.properties | 1 +
.../apache/hop/i18n/messages/messages.properties | 3 ++
.../hop/i18n/messages/messages_fr_FR.properties | 2 ++
5 files changed, 66 insertions(+), 3 deletions(-)
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 95038b9eae..05e661c384 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 class GlobalMessageUtil {
final boolean fallbackOnRoot) {
final Set<Locale> 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 @@ public class GlobalMessageUtil {
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 3c38655bc8..ad5afce9c5 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 @@ class GlobalMessageUtilTest {
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 59fc6f11a0..228c0be06a 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 e07acdfb15..4bce5e0a5f 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 59fc6f11a0..403d4db377 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=