From 34beaa569bfb32f1607375f1d5a22859322060d2 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 24 May 2016 09:36:27 -0300 Subject: PLT-1800 Load server side locale from the config.json (#3076) * PLT-1800 Load server side locale from the config.json * Add support for locales with country specifics --- webapp/components/root.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'webapp/components/root.jsx') diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index 0adbc7f04..d27a6d8ac 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -6,6 +6,7 @@ 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'; @@ -28,7 +29,10 @@ export default class Root extends React.Component { this.redirectIfNecessary = this.redirectIfNecessary.bind(this); } localizationChanged() { - this.setState({locale: LocalizationStore.getLocale(), translations: LocalizationStore.getTranslations()}); + const locale = LocalizationStore.getLocale(); + + Client.setAcceptLanguage(locale); + this.setState({locale, translations: LocalizationStore.getTranslations()}); } redirectIfNecessary(props) { @@ -63,7 +67,7 @@ export default class Root extends React.Component { FastClick.attach(document.body); // Get our localizaiton - GlobalActions.loadBrowserLocale(); + GlobalActions.loadDefaultLocale(); // Redirect if Necessary this.redirectIfNecessary(this.props); -- cgit v1.2.3-1-g7c22