From b89ad9b21780d4c3f185ef5dead9edf23fa6ba00 Mon Sep 17 00:00:00 2001
From: c727 <crusader727@gmx.de>
Date: Mon, 9 Jul 2018 14:43:36 +0200
Subject: [PATCH] Fix language detection for country codes (#1426)

* Fix language detection for country codes

navigator.languages = ["de-DE"],  navigator.languages = "de-DE" was detected as en before

* Use for each

* Use for of
---
 src/util/hass-translation.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/util/hass-translation.js b/src/util/hass-translation.js
index ea86d4f910..77ad24c7ae 100644
--- a/src/util/hass-translation.js
+++ b/src/util/hass-translation.js
@@ -36,24 +36,24 @@ export function getActiveTranslation() {
     if (translation) {
       return translation;
     }
-  } else if (navigator.languages) {
-    for (let i = 0; i < navigator.languages.length; i++) {
-      translation = languageGetTranslation(navigator.languages[i]);
+  }
+  if (navigator.languages) {
+    for (const locale of navigator.languages) {
+      translation = languageGetTranslation(locale);
       if (translation) {
         return translation;
       }
     }
-  } else {
-    translation = languageGetTranslation(navigator.language);
+  }
+  translation = languageGetTranslation(navigator.language);
+  if (translation) {
+    return translation;
+  }
+  if (navigator.language.includes('-')) {
+    translation = languageGetTranslation(navigator.language.split('-')[0]);
     if (translation) {
       return translation;
     }
-    if (navigator.language.includes('-')) {
-      translation = languageGetTranslation(navigator.language.split('-')[0]);
-      if (translation) {
-        return translation;
-      }
-    }
   }
 
   // Final fallback