From cbf967a86d9cc5de38a4e600b8c67f76450d39a4 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 20:53:59 +0200
Subject: [PATCH 1/5] Fix tests

We do not have a en.json but a en_EN.json
---
 src/languageHandler.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index ab29dd926e..65e82a7c81 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -141,11 +141,11 @@ export function setLanguage(preferredLangs) {
         console.log("set language to " + langToUse);
 
         // Set 'en' as fallback language:
-        if (langToUse != "en") {
-            return getLanguage(i18nFolder + availLangs['en'].fileName);
+        if (langToUse != "en_EN") {
+            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
         }
     }).then((langData) => {
-        if (langData) counterpart.registerTranslations('en', langData);
+        if (langData) counterpart.registerTranslations('en_EN', langData);
     });
 };
 

From 51131ef7a54e52e6bafd3a37fcea4d8357fdc66a Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:02:40 +0200
Subject: [PATCH 2/5] Fix translation tests part 2

---
 src/languageHandler.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 65e82a7c81..feb91cf2ef 100644
--- 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_EN'
+            console.error("Unable to find an appropriate language");
         }
 
         return getLanguage(i18nFolder + availLangs[langToUse].fileName);
@@ -142,7 +144,7 @@ export function setLanguage(preferredLangs) {
 
         // Set 'en' as fallback language:
         if (langToUse != "en_EN") {
-            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
+            return getLanguage(i18nFolder + availLangs[langToUse].fileName);
         }
     }).then((langData) => {
         if (langData) counterpart.registerTranslations('en_EN', langData);

From 924a8d1be041f83eeef9650e3b0798b710812bb4 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:03:43 +0200
Subject: [PATCH 3/5] Fix line change that should not happen

---
 src/languageHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index feb91cf2ef..33f9781f99 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -144,7 +144,7 @@ export function setLanguage(preferredLangs) {
 
         // Set 'en' as fallback language:
         if (langToUse != "en_EN") {
-            return getLanguage(i18nFolder + availLangs[langToUse].fileName);
+            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
         }
     }).then((langData) => {
         if (langData) counterpart.registerTranslations('en_EN', langData);

From 1b35f816fba21e880577c26eb03f3a0792e96c09 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:10:32 +0200
Subject: [PATCH 4/5] Fix languages.json

---
 test/i18n/languages.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/i18n/languages.json b/test/i18n/languages.json
index e3a2595370..5dc02003f7 100644
--- 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"
+    }
 }

From 8c2728ffc52a6ae60b3c19934e94cdc934cb0995 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Thu, 1 Jun 2017 21:10:58 +0200
Subject: [PATCH 5/5] Revert changes of the key used

---
 src/languageHandler.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 33f9781f99..798798b6e5 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -131,7 +131,7 @@ export function setLanguage(preferredLangs) {
         }
         if (!langToUse) {
             // Fallback to en_EN if none is found
-            langToUse = 'en_EN'
+            langToUse = 'en'
             console.error("Unable to find an appropriate language");
         }
 
@@ -143,11 +143,11 @@ export function setLanguage(preferredLangs) {
         console.log("set language to " + langToUse);
 
         // Set 'en' as fallback language:
-        if (langToUse != "en_EN") {
-            return getLanguage(i18nFolder + availLangs['en_EN'].fileName);
+        if (langToUse != "en") {
+            return getLanguage(i18nFolder + availLangs['en'].fileName);
         }
     }).then((langData) => {
-        if (langData) counterpart.registerTranslations('en_EN', langData);
+        if (langData) counterpart.registerTranslations('en', langData);
     });
 };