Merge pull request #2533 from ZBoxApp/PLT-2358

PLT-2358: Detect user localization using client headers

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);