From b80c52dab24bb3f5bae6eee676664726d088becb Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 15 Mar 2018 12:33:32 -0700
Subject: [PATCH] Fix race condition setting current language (#996)

---
 src/home-assistant.html        | 4 ++--
 src/util/hass-translation.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/home-assistant.html b/src/home-assistant.html
index f3f6581720..546bc925e6 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -173,8 +173,8 @@ class HomeAssistant extends Polymer.Element {
       themes: null,
       panelUrl: this.panelUrl,
 
-      // If language and resources are already loaded, don't discard them
-      language: (this.hass && this.hass.language) || null,
+      language: window.getActiveTranslation(),
+      // If resources are already loaded, don't discard them
       resources: (this.hass && this.hass.resources) || null,
 
       translationMetadata: window.translationMetadata,
diff --git a/src/util/hass-translation.html b/src/util/hass-translation.html
index 15314ea70c..d23377fbd7 100644
--- a/src/util/hass-translation.html
+++ b/src/util/hass-translation.html
@@ -1,7 +1,7 @@
 <link rel='import' href='../../build-translations/translationMetadata.html' />
 
 <script>
-function getActiveTranslation() {
+window.getActiveTranslation = function () {
   // Perform case-insenstive comparison since browser isn't required to
   // report languages with specific cases.
   const lookup = {};
@@ -59,7 +59,7 @@ function getActiveTranslation() {
 
   // Final fallback
   return 'en';
-}
+};
 
 // Store loaded translations in memory so translations are available immediately
 // when DOM is created in Polymer. Even a cache lookup creates noticeable latency.