FIXED: default to en locale if preferred locale is not available fixes #167 (#168)

Author: warpdesign

package-lock.json

@@ -37,4 +37,6 @@ i18next.on('languageChanged', () => {
     ipcRenderer.send('languageChanged', i18next.t('APP_MENUS', { returnObjects: true }));
 });
 
-export { i18next };
+const languageList = Object.keys(locales);
+
+export { i18next, languageList };

src/locale/i18n.ts

@@ -1,7 +1,7 @@
 import { observable, action } from "mobx";
 import { remote } from 'electron';
 import { JSObject } from "../components/Log";
-import { i18next } from '../locale/i18n';
+import { i18next, languageList } from '../locale/i18n';
 import { isMojave, isWin, isMac, defaultFolder } from '../utils/platform';
 
 const { systemPreferences } = remote;
@@ -71,19 +71,15 @@ export class SettingsState {
             lang = remote.app.getLocale();
         }
 
-        // Note: it seems i18next may not always
-        // have cached all languages, even though it will correctly work.
-        // Comment this out for now since it prevents locale other than English
-        // from working
-        // if (i18next.languages.indexOf(lang) < 0) {
-        //     lang = 'en';
-        // }
+        // fallback to English if preferred language
+        // isn't available
+        if (languageList.indexOf(lang) < 0) {
+            lang = 'en';
+        }
 
         // finally set requested language
         i18next.changeLanguage(lang);
 
-        console.log('setting language to', i18next.language);
-
         this.lang = i18next.language;
     }
 
@@ -118,6 +114,7 @@ export class SettingsState {
     @action
     loadAndUpgradeSettings(): JSObject {
         let settings = this.getParam(APP_STORAGE_KEY);
+
         // no settings set: first time the app is run
         if (settings === null) {
             settings = this.getDefaultSettings();