From e7fbf889fae4daf89b75fc67af0e7435f0a35ed3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 19:53:27 +0100
Subject: [PATCH] Make current language more accurate

Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.

Also fix style.
---
 src/components/structures/UserSettings.js | 18 ++++++------------
 src/languageHandler.js                    |  4 ++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b2bf693cfe..c9a9c58939 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -202,16 +202,10 @@ module.exports = React.createClass({
         this._syncedSettings = syncedSettings;
 
         this._localSettings = UserSettingsStore.getLocalSettings();
-        if (!this._localSettings.hasOwnProperty('language')) {
-            const language = languageHandler.normalizeLanguageKey(languageHandler.getLanguageFromBrowser());
-            this.setState({
-                Language: language
-            });
-        } else {
-            this.setState({
-                Language: this._localSettings.language
-            });
-        }
+
+        this.setState({
+            language: languageHandler.getCurrentLanguage(),
+        });
     },
 
     componentDidMount: function() {
@@ -551,7 +545,7 @@ module.exports = React.createClass({
     onLanguageChange: function(l) {
         UserSettingsStore.setLocalSetting('language', l);
         this.setState({
-          Language: l,
+            language: l,
         });
         PlatformPeg.get().reload();
     },
@@ -562,7 +556,7 @@ module.exports = React.createClass({
             <label htmlFor="languageSelector">{_t('Interface Language')}</label>
             <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
                           className="mx_UserSettings_language"
-                          value={this.state.Language}
+                          value={this.state.language}
             />
         </div>;
     },
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 4b49c95fc9..6734c99582 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -116,6 +116,10 @@ export function normalizeLanguageKey(language) {
     return language.toLowerCase().replace("_","-");
 };
 
+export function getCurrentLanguage() {
+    return counterpart.getLocale();
+}
+
 function getLangsJson() {
     const deferred = q.defer();