diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-09 16:00:40 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 16:00:40 -0400 |
commit | 0c701cc1d02c3d3b630050a0547f9dc632596013 (patch) | |
tree | b26324ebe2457d5cc8f8547513c053add166fc3c /webapp/actions/global_actions.jsx | |
parent | e52ab9737ed4043b5c6236561939d50a8588b349 (diff) | |
download | chat-0c701cc1d02c3d3b630050a0547f9dc632596013.tar.gz chat-0c701cc1d02c3d3b630050a0547f9dc632596013.tar.bz2 chat-0c701cc1d02c3d3b630050a0547f9dc632596013.zip |
PLT-6518 Fixed user's locale not being loaded with redux actions (#6359)
* Stopped ManageLanguages component from mutating user
* Removed obsolete reference to mm_user
* PLT-6518 Fixed user's locale not being loaded with redux actions
Diffstat (limited to 'webapp/actions/global_actions.jsx')
-rw-r--r-- | webapp/actions/global_actions.jsx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index ed434fdc7..79706b594 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -379,7 +379,7 @@ export function newLocalizationSelected(locale) { translations: en }); } else { - const localeInfo = I18n.getLanguageInfo(locale) || I18n.getLanguageInfo(global.window.mm_config.DefaultClientLocale); + const localeInfo = I18n.getLanguageInfo(locale); Client.getTranslations( localeInfo.url, @@ -401,13 +401,23 @@ export function newLocalizationSelected(locale) { } } +export function loadCurrentLocale() { + const user = UserStore.getCurrentUser(); + + if (user && user.locale) { + newLocalizationSelected(user.locale); + } else { + loadDefaultLocale(); + } +} + export function loadDefaultLocale() { - const defaultLocale = global.window.mm_config.DefaultClientLocale; - let locale = global.window.mm_user ? global.window.mm_user.locale || defaultLocale : defaultLocale; + let locale = global.window.mm_config.DefaultClientLocale; if (!I18n.getLanguageInfo(locale)) { locale = 'en'; } + return newLocalizationSelected(locale); } |