diff options
author | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
commit | 9d109b070037951fcd0832b785eba8a3db9a157c (patch) | |
tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/actions/global_actions.jsx | |
parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
parent | a21a06afd9907e9911dcb166d902cba9f405c7cb (diff) | |
download | chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2 chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip |
Merge branch 'release-3.9' into merge-3.9
Diffstat (limited to 'webapp/actions/global_actions.jsx')
-rw-r--r-- | webapp/actions/global_actions.jsx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index ed434fdc7..3c88a7013 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -58,7 +58,7 @@ export function emitChannelClickEvent(channel) { getMyChannelMemberPromise.then(() => { getChannelStats(chan.id)(dispatch, getState); - viewChannel(chan.id)(dispatch, getState); + viewChannel(chan.id, oldChannelId)(dispatch, getState); loadPosts(chan.id); // Mark previous and next channel as read @@ -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); } |