diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-06-01 11:56:27 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-06-01 11:56:27 -0400 |
commit | 786e4dce7d520f79b8cf76939d84678d72941420 (patch) | |
tree | 5bb520880d200cba90c5ada250c63144e18c3333 /webapp/actions | |
parent | b00a60ab71b2bd4640c8608d71805ba9caae97d9 (diff) | |
download | chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.gz chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.bz2 chat-786e4dce7d520f79b8cf76939d84678d72941420.zip |
Revert "PLT-1800 Load server side locale from the config.json" (#3201)
Diffstat (limited to 'webapp/actions')
-rw-r--r-- | webapp/actions/global_actions.jsx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 0b264a9b3..91b51a9c2 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -392,10 +392,8 @@ export function newLocalizationSelected(locale) { translations: en }); } else { - const localeInfo = I18n.getLanguageInfo(locale) || I18n.getLanguageInfo(global.window.mm_config.DefaultClientLocale); - Client.getTranslations( - localeInfo.url, + I18n.getLanguageInfo(locale).url, (data, res) => { let translations = data; if (!data && res.text) { @@ -414,11 +412,16 @@ export function newLocalizationSelected(locale) { } } -export function loadDefaultLocale() { - const defaultLocale = global.window.mm_config.DefaultClientLocale; - let locale = global.window.mm_user ? global.window.mm_user.locale || defaultLocale : defaultLocale; +export function loadBrowserLocale() { + let locale = (navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] : + (navigator.language || navigator.userLanguage)).split('-')[0]; + + const user = UserStore.getCurrentUser(); + if (user) { + locale = user.locale || locale; + } - if (!I18n.getLanguageInfo(locale)) { + if (!I18n.getLanguages()[locale]) { locale = 'en'; } return newLocalizationSelected(locale); |