diff options
author | JoramWilander <jwawilander@gmail.com> | 2016-05-27 14:38:41 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2016-05-27 14:38:41 -0400 |
commit | 6f8d4a18eecfa9f0b8e817e75555e447d33faeb2 (patch) | |
tree | 2c4afbea82b27491cad87a9881b0d907667be886 /webapp/actions | |
parent | a9a0e1f6db7384c22c2dba7dbb95c385590c2c61 (diff) | |
parent | cb745475452a9fc8ef3a9fedf6b34af7d05adba9 (diff) | |
download | chat-6f8d4a18eecfa9f0b8e817e75555e447d33faeb2.tar.gz chat-6f8d4a18eecfa9f0b8e817e75555e447d33faeb2.tar.bz2 chat-6f8d4a18eecfa9f0b8e817e75555e447d33faeb2.zip |
Merge branch 'release-3.0'
Diffstat (limited to 'webapp/actions')
-rw-r--r-- | webapp/actions/global_actions.jsx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 2e2b1b247..91b51a9c2 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -394,11 +394,15 @@ export function newLocalizationSelected(locale) { } else { Client.getTranslations( I18n.getLanguageInfo(locale).url, - (data) => { + (data, res) => { + let translations = data; + if (!data && res.text) { + translations = JSON.parse(res.text); + } AppDispatcher.handleServerAction({ type: ActionTypes.RECEIVED_LOCALE, locale, - translations: data + translations }); }, (err) => { @@ -411,6 +415,12 @@ export function newLocalizationSelected(locale) { 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.getLanguages()[locale]) { locale = 'en'; } |