From 786e4dce7d520f79b8cf76939d84678d72941420 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 1 Jun 2016 11:56:27 -0400
Subject: Revert "PLT-1800 Load server side locale from the config.json"
 (#3201)

---
 webapp/components/root.jsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'webapp/components/root.jsx')

diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx
index abaa05bb5..c96499392 100644
--- a/webapp/components/root.jsx
+++ b/webapp/components/root.jsx
@@ -6,7 +6,6 @@
 
 import * as GlobalActions from 'actions/global_actions.jsx';
 import LocalizationStore from 'stores/localization_store.jsx';
-import Client from 'utils/web_client.jsx';
 
 import {IntlProvider} from 'react-intl';
 
@@ -42,10 +41,7 @@ export default class Root extends React.Component {
         FastClick.attach(document.body);
     }
     localizationChanged() {
-        const locale = LocalizationStore.getLocale();
-
-        Client.setAcceptLanguage(locale);
-        this.setState({locale, translations: LocalizationStore.getTranslations()});
+        this.setState({locale: LocalizationStore.getLocale(), translations: LocalizationStore.getTranslations()});
     }
 
     redirectIfNecessary(props) {
@@ -71,7 +67,7 @@ export default class Root extends React.Component {
         LocalizationStore.addChangeListener(this.localizationChanged);
 
         // Get our localizaiton
-        GlobalActions.loadDefaultLocale();
+        GlobalActions.loadBrowserLocale();
     }
     componentWillUnmount() {
         LocalizationStore.removeChangeListener(this.localizationChanged);
-- 
cgit v1.2.3-1-g7c22