This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new b3f20c5 HOP-3547: add Beta indicator to languages and switch to EN
new ec82401 Merge pull request #1223 from hansva/master
b3f20c5 is described below
commit b3f20c553dd6d9af6e419301c2e06ac2c2119c56
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Dec 15 00:20:06 2021 +0100
HOP-3547: add Beta indicator to languages and switch to EN
---
.../java/org/apache/hop/i18n/GlobalMessages.java | 36 ++++++++++++++++------
.../java/org/apache/hop/i18n/LanguageChoice.java | 7 +++++
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/i18n/GlobalMessages.java
b/core/src/main/java/org/apache/hop/i18n/GlobalMessages.java
index 0454cb4..ec8afcf 100644
--- a/core/src/main/java/org/apache/hop/i18n/GlobalMessages.java
+++ b/core/src/main/java/org/apache/hop/i18n/GlobalMessages.java
@@ -42,18 +42,34 @@ public class GlobalMessages extends AbstractMessageHandler {
public static final String[] localeDescr = {
"English (US)",
- "Nederlands",
- "Simplified Chinese",
- "Espa\u00F1ol (Spain)",
+ "Nederlands (Beta)",
+ "Simplified Chinese (Beta)",
+ "Espa\u00F1ol (Spain) (Beta)",
"Fran\u00E7ais",
- "Deutsch",
- "Portuguese (Brazil)",
- "Portuguese (Portugal)",
- "Espa\u00F1ol (Argentina)",
- "Norwegian (Norway)",
+ "Deutsch (Beta)",
+ "Portuguese (Brazil) (Beta)",
+ "Portuguese (Portugal) (Beta)",
+ "Espa\u00F1ol (Argentina) (Beta)",
+ "Norwegian (Norway) (Beta)",
"Italian (Italy)",
- "Japanese (Japan)",
- "Korean (Korea)",
+ "Japanese (Japan) (Beta)",
+ "Korean (Korea) (Beta)",
+ };
+
+ public static final String[] localeBetaStatus = {
+ "N", //"English (US)"
+ "Y", //"Nederlands"
+ "Y", //"Simplified Chinese"
+ "Y", //"Espa\u00F1ol (Spain)"
+ "N", //"Fran\u00E7ais"
+ "Y", //"Deutsch"
+ "Y", //"Portuguese (Brazil)"
+ "Y", //"Portuguese (Portugal)"
+ "Y", //"Espa\u00F1ol (Argentina)"
+ "Y", //"Norwegian (Norway)"
+ "N", //"Italian (Italy)"
+ "Y", //"Japanese (Japan)"
+ "Y", //"Korean (Korea)"
};
protected static GlobalMessages GMinstance = null;
diff --git a/core/src/main/java/org/apache/hop/i18n/LanguageChoice.java
b/core/src/main/java/org/apache/hop/i18n/LanguageChoice.java
index 75bd7c3..16ec589 100644
--- a/core/src/main/java/org/apache/hop/i18n/LanguageChoice.java
+++ b/core/src/main/java/org/apache/hop/i18n/LanguageChoice.java
@@ -17,6 +17,7 @@
package org.apache.hop.i18n;
+import org.apache.hop.core.Const;
import org.apache.hop.core.config.HopConfig;
import org.apache.hop.core.util.EnvUtil;
@@ -33,6 +34,12 @@ public class LanguageChoice {
String defaultLocaleString =
HopConfig.readOptionString(STRING_DEFAULT_LOCALE, null);
if (defaultLocaleString == null) {
defaultLocale = Locale.getDefault();
+ // check if in language list and if beta language
+ int localeIdx = Const.indexOfString(defaultLocale.toString(),
GlobalMessages.localeCodes);
+ if (localeIdx < 0 ||
GlobalMessages.localeBetaStatus[localeIdx].equals("Y")) {
+ // if not in language list or it is a beta language set to en-US
+ defaultLocale = Locale.forLanguageTag("en-US");
+ }
HopConfig.getInstance().saveOption(STRING_DEFAULT_LOCALE,
defaultLocale.toString());
} else {
defaultLocale = EnvUtil.createLocale(defaultLocaleString);
