Merge pull request #1001 from MTRNord/patch-4

ara4n · web-flow · commit 54ae92e9fb3a · 2017-06-01T20:18:55.000+01:00
Fix tests
diff --git a/src/languageHandler.js b/src/languageHandler.js
@@ -130,7 +130,9 @@ export function setLanguage(preferredLangs) {
             }
         }
         if (!langToUse) {
-            throw new Error("Unable to find an appropriate language");
+            // Fallback to en_EN if none is found
+            langToUse = 'en'
+            console.error("Unable to find an appropriate language");
         }
 
         return getLanguage(i18nFolder + availLangs[langToUse].fileName);
diff --git a/test/i18n/languages.json b/test/i18n/languages.json
@@ -1,4 +1,6 @@
 {
-    "fileName": "en_EN.json",
-    "label": "English"
+    "en": {
+        "fileName": "en_EN.json",
+        "label": "English"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,9 @@ export function setLanguage(preferredLangs) {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`if (!langToUse) {`
`133`		`- throw new Error("Unable to find an appropriate language");`
	`133`	`+ // Fallback to en_EN if none is found`
	`134`	`+ langToUse = 'en'`
	`135`	`+ console.error("Unable to find an appropriate language");`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`return getLanguage(i18nFolder + availLangs[langToUse].fileName);`