diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
commit | 4ae7128ecb66cdddeb9d40a24970c6552814c18b (patch) | |
tree | b979b83b3c25be0c817b3b4f4dc4d17735801048 /webapp/components/root.jsx | |
parent | 3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (diff) | |
download | chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.gz chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.bz2 chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.zip |
Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
Diffstat (limited to 'webapp/components/root.jsx')
-rw-r--r-- | webapp/components/root.jsx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index d27a6d8ac..0adbc7f04 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -6,7 +6,6 @@ import * as GlobalActions from 'action_creators/global_actions.jsx'; import LocalizationStore from 'stores/localization_store.jsx'; -import Client from 'utils/web_client.jsx'; import {IntlProvider} from 'react-intl'; @@ -29,10 +28,7 @@ export default class Root extends React.Component { this.redirectIfNecessary = this.redirectIfNecessary.bind(this); } localizationChanged() { - const locale = LocalizationStore.getLocale(); - - Client.setAcceptLanguage(locale); - this.setState({locale, translations: LocalizationStore.getTranslations()}); + this.setState({locale: LocalizationStore.getLocale(), translations: LocalizationStore.getTranslations()}); } redirectIfNecessary(props) { @@ -67,7 +63,7 @@ export default class Root extends React.Component { FastClick.attach(document.body); // Get our localizaiton - GlobalActions.loadDefaultLocale(); + GlobalActions.loadBrowserLocale(); // Redirect if Necessary this.redirectIfNecessary(this.props); |