From 70544f51ed670b6390d394223fd6a968bb8ace03 Mon Sep 17 00:00:00 2001
From: andrey-git <andrey-git@users.noreply.github.com>
Date: Fri, 27 Oct 2017 23:07:24 +0300
Subject: [PATCH 1/5] Fix languages and themes top selection being cut off

---
 panels/config/core/ha-config-core.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/panels/config/core/ha-config-core.html b/panels/config/core/ha-config-core.html
index 96530c431d..1ecbe6f446 100644
--- a/panels/config/core/ha-config-core.html
+++ b/panels/config/core/ha-config-core.html
@@ -15,6 +15,7 @@
     <style include="iron-flex ha-style">
       .content {
         padding-bottom: 32px;
+        transform: translate(0);
       }
 
       .border {

From 794c82b8ba2c8abcb8194a56cb2727e36f5aca73 Mon Sep 17 00:00:00 2001
From: andrey-git <andrey-git@users.noreply.github.com>
Date: Fri, 27 Oct 2017 23:24:55 +0300
Subject: [PATCH 2/5] Make translation utils properly handle null selected
 language.

---
 src/util/hass-translation.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/util/hass-translation.html b/src/util/hass-translation.html
index efdeeb4ffa..007f66aa3e 100644
--- a/src/util/hass-translation.html
+++ b/src/util/hass-translation.html
@@ -6,7 +6,7 @@ function getActiveTranslation() {
   // report languages with specific cases.
   const lookup = {};
   /* eslint-disable no-undef */
-  Object.keys(window.translationMetadata).forEach(function (tr) {
+  Object.keys(window.translationMetadata).forEach((tr) => {
     lookup[tr.toLowerCase()] = tr;
   });
 
@@ -14,7 +14,7 @@ function getActiveTranslation() {
   function languageGetTranslation(language) {
     const subtags = language.toLowerCase().split('-');
 
-    for (var i = subtags.length; i >= 1; i--) {
+    for (let i = subtags.length; i >= 1; i--) {
       const lang = subtags.slice(0, i).join('-');
 
       if (lookup[lang]) {
@@ -24,14 +24,14 @@ function getActiveTranslation() {
     return null;
   }
 
-  var translation = null;
-  if (window.localStorage.selectedLanguage) {
+  let translation = null;
+  if (window.localStorage.selectedLanguage && JSON.parse(window.localStorage.selectedLanguage)) {
     translation = languageGetTranslation(JSON.parse(window.localStorage.selectedLanguage));
     if (translation) {
       return translation;
     }
   } else if (navigator.languages) {
-    for (var i = 0; i < navigator.languages.length; i++) {
+    for (let i = 0; i < navigator.languages.length; i++) {
       translation = languageGetTranslation(navigator.languages[i]);
       if (translation) {
         return translation;
@@ -54,7 +54,11 @@ const translations = {};
 
 window.getTranslation = function (translationInput) {
   const translation = translationInput || getActiveTranslation();
-  const translationFingerprint = window.translationMetadata[translation].fingerprint;
+  const metadata = window.translationMetadata[translation];
+  if (!metadata) {
+    return Promise.reject(new Error('Language ' + translation + ' not found in metadata'));
+  }
+  const translationFingerprint = metadata.fingerprint;
 
   // Create a promise to fetch translation from the server
   if (!translations[translationFingerprint]) {

From 1a7fa6041e4ba7149b5c188d357a45b28b365dbe Mon Sep 17 00:00:00 2001
From: andrey-git <andrey-git@users.noreply.github.com>
Date: Fri, 27 Oct 2017 23:26:12 +0300
Subject: [PATCH 3/5] Revert "Fix languages and themes top selection being cut
 off"

This reverts commit 70544f51ed670b6390d394223fd6a968bb8ace03.
---
 panels/config/core/ha-config-core.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/panels/config/core/ha-config-core.html b/panels/config/core/ha-config-core.html
index 1ecbe6f446..96530c431d 100644
--- a/panels/config/core/ha-config-core.html
+++ b/panels/config/core/ha-config-core.html
@@ -15,7 +15,6 @@
     <style include="iron-flex ha-style">
       .content {
         padding-bottom: 32px;
-        transform: translate(0);
       }
 
       .border {

From e9d84d2a6904e6cb6d29d57afbd2bd5911a90cd1 Mon Sep 17 00:00:00 2001
From: andrey-git <andrey-git@users.noreply.github.com>
Date: Sat, 28 Oct 2017 11:55:30 +0300
Subject: [PATCH 4/5] Only parse JSON once

---
 src/util/hass-translation.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/util/hass-translation.html b/src/util/hass-translation.html
index 007f66aa3e..aa2755e70e 100644
--- a/src/util/hass-translation.html
+++ b/src/util/hass-translation.html
@@ -25,8 +25,16 @@ function getActiveTranslation() {
   }
 
   let translation = null;
-  if (window.localStorage.selectedLanguage && JSON.parse(window.localStorage.selectedLanguage)) {
-    translation = languageGetTranslation(JSON.parse(window.localStorage.selectedLanguage));
+  let selectedLanguage;
+  if (window.localStorage.selectedLanguage) {
+    try {
+      selectedLanguage = JSON.parse(window.localStorage.selectedLanguage);
+    } catch (e) {
+      // Ignore parsing error.
+    }
+  }
+  if (selectedLanguage) {
+    translation = languageGetTranslation(selectedLanguage);
     if (translation) {
       return translation;
     }

From 386193ee441e057d5bdea7a9ac460d86ed8f0441 Mon Sep 17 00:00:00 2001
From: andrey-git <andrey-git@users.noreply.github.com>
Date: Mon, 30 Oct 2017 19:03:38 +0200
Subject: [PATCH 5/5] Fall back to english on missing fingerprint.

---
 src/util/hass-translation.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util/hass-translation.html b/src/util/hass-translation.html
index aa2755e70e..b161ecac7c 100644
--- a/src/util/hass-translation.html
+++ b/src/util/hass-translation.html
@@ -64,7 +64,10 @@ window.getTranslation = function (translationInput) {
   const translation = translationInput || getActiveTranslation();
   const metadata = window.translationMetadata[translation];
   if (!metadata) {
-    return Promise.reject(new Error('Language ' + translation + ' not found in metadata'));
+    if (translationInput !== 'en') {
+      return window.getTranslation('en');
+    }
+    return Promise.reject(new Error('Language en not found in metadata'));
   }
   const translationFingerprint = metadata.fingerprint;