diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-25 23:00:47 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-25 23:00:47 -0400 |
| commit | 4807cddb174425c817134386be79e2ec70787bc1 (patch) | |
| tree | 24a988ef680aa973232c14dda68d34e8d5475e37 | |
| parent | ad6a83571273b197d72e32aecab0b7159e9fd6fe (diff) | |
| parent | 29363680e8adf441e5debbc112c1104725023da4 (diff) | |
| download | chat-4807cddb174425c817134386be79e2ec70787bc1.tar.gz chat-4807cddb174425c817134386be79e2ec70787bc1.tar.bz2 chat-4807cddb174425c817134386be79e2ec70787bc1.zip | |
Merge pull request #2544 from ZBoxApp/loc-fix
Fix default Browser locale
| -rw-r--r-- | webapp/action_creators/global_actions.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/action_creators/global_actions.jsx b/webapp/action_creators/global_actions.jsx index 196d2b32c..7322f1150 100644 --- a/webapp/action_creators/global_actions.jsx +++ b/webapp/action_creators/global_actions.jsx @@ -265,7 +265,8 @@ export function newLocalizationSelected(locale) { } export function loadBrowserLocale() { - let locale = (navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage)).split('-')[0]; + let locale = (navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] : + (navigator.language || navigator.userLanguage)).split('-')[0]; if (!I18n.getLanguages()[locale]) { locale = 'en'; } |