From a2c183f401bdf8e9abddd35d4561d42034325046 Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 27 May 2016 09:25:37 -0300 Subject: PLT-1800 Load server side locale from the config.json (#3092) * PLT-1800 Load server side locale from the config.json * Add support for locales with country specifics * Fix localization on served locale file as plain/text --- webapp/stores/user_store.jsx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'webapp/stores') diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx index 855222d47..f57ecf1cd 100644 --- a/webapp/stores/user_store.jsx +++ b/webapp/stores/user_store.jsx @@ -4,6 +4,9 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import EventEmitter from 'events'; +import * as GlobalActions from 'actions/global_actions.jsx'; +import LocalizationStore from './localization_store.jsx'; + import Constants from 'utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; @@ -100,6 +103,9 @@ class UserStoreClass extends EventEmitter { this.saveProfile(user); this.currentUserId = user.id; global.window.mm_current_user_id = this.currentUserId; + if (LocalizationStore.getLocale() !== user.locale) { + GlobalActions.newLocalizationSelected(user.locale); + } } getCurrentId() { -- cgit v1.2.3-1-g7c22