If a language resource is missing, fallback to system default

orrche · May 21, 2018 · 8dd9a3e · 8dd9a3e
1 parent a64d1cb
commit 8dd9a3e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/arduino-core/src/cc/arduino/i18n/Languages.java b/arduino-core/src/cc/arduino/i18n/Languages.java
@@ -35,6 +35,15 @@ public class Languages {
 
   public static final Language[] languages;
 
+  public static boolean have(String isoCode) {
+    for (Language language : languages) {
+      if (language.getIsoCode().equals(isoCode)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   static {
     languages = new Language[]{
       new Language(tr("System Default"), "", ""),

diff --git a/arduino-core/src/processing/app/PreferencesData.java b/arduino-core/src/processing/app/PreferencesData.java
@@ -1,6 +1,8 @@
 package processing.app;
 
 import org.apache.commons.compress.utils.IOUtils;
+
+import cc.arduino.i18n.Languages;
 import processing.app.helpers.PreferencesHelper;
 import processing.app.helpers.PreferencesMap;
 import processing.app.legacy.PApplet;
@@ -78,8 +80,13 @@ static public void init(File file) throws Exception {
     }
 
     // load the I18n module for internationalization
+    String lang = get("editor.languages.current");
+    if (lang == null || !Languages.have(lang)) {
+      lang = "";
+      set("editor.languages.current", "");
+    }
     try {
-      I18n.init(get("editor.languages.current"));
+      I18n.init(lang);
     } catch (MissingResourceException e) {
       I18n.init("en");
       set("editor.languages.current", "en");