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
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
79c0b20689
Коммит
34beaa569b
@@ -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);
|
||||
|
||||
Ссылка в новой задаче
Block a user