diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-03-24 15:25:03 -0300 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-03-24 15:41:08 -0300 |
commit | b14a87c3bc1d0022d79731261d83b07a154084c3 (patch) | |
tree | 1c1dad221f5bfe22f93cf3241e46e74585010f2c /webapp | |
parent | 998ce12133358eab587702e258edefbd437f86ba (diff) | |
download | chat-b14a87c3bc1d0022d79731261d83b07a154084c3.tar.gz chat-b14a87c3bc1d0022d79731261d83b07a154084c3.tar.bz2 chat-b14a87c3bc1d0022d79731261d83b07a154084c3.zip |
PLT-2358: Detect user localization using client headers
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/action_creators/global_actions.jsx | 8 | ||||
-rw-r--r-- | webapp/components/root.jsx | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/webapp/action_creators/global_actions.jsx b/webapp/action_creators/global_actions.jsx index ab38532a6..196d2b32c 100644 --- a/webapp/action_creators/global_actions.jsx +++ b/webapp/action_creators/global_actions.jsx @@ -264,6 +264,14 @@ export function newLocalizationSelected(locale) { } } +export function loadBrowserLocale() { + let locale = (navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage)).split('-')[0]; + if (!I18n.getLanguages()[locale]) { + locale = 'en'; + } + return newLocalizationSelected(locale); +} + export function viewLoggedIn() { AsyncClient.getChannels(); AsyncClient.getChannelExtraInfo(); diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index 9963bc5dd..3b85b23fd 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -69,7 +69,7 @@ export default class Root extends React.Component { FastClick.attach(document.body); // Get our localizaiton - GlobalActions.newLocalizationSelected('en'); + GlobalActions.loadBrowserLocale(); } componentWillUnmount() { LocalizationStore.removeChangeListener(this.localizationChanged); |