Fixed LocalUtils and Setting plugin to display supported locales (#1864)

geosolutions-it · May 22, 2017 · 8956ff3 · 8956ff3
1 parent a3ea7f1
commit 8956ff3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/web/client/plugins/Settings.jsx b/web/client/plugins/Settings.jsx
@@ -31,6 +31,7 @@ const {Glyphicon} = require('react-bootstrap');
 const assign = require('object-assign');
 
 const SettingsPanel = require('./settings/SettingsPanel');
+const LocaleUtils = require('../utils/LocaleUtils');
 const {Panel} = require('react-bootstrap');
 const Dialog = require('../components/misc/Dialog');
 
@@ -85,7 +86,7 @@ const SettingsButton = React.createClass({
     },
     renderSettings() {
         const settingsFirst = {
-            language: <span><label><Message msgId="language" /></label> <LangBar key="langSelector"/></span>
+            language: <span><label><Message msgId="language" /></label> <LangBar locales={LocaleUtils.getSupportedLocales()} key="langSelector"/></span>
         };
         const settingsLast = {
             history: <HistoryBar

diff --git a/web/client/utils/LocaleUtils.js b/web/client/utils/LocaleUtils.js
@@ -70,10 +70,12 @@ const LocaleUtils = {
         return LocaleUtils.getLocale(url.parse(window.location.href, true).query);
     },
     getLocale: function(query) {
+        const key = Object.keys(supportedLocales)[0];
+        const defaultLocale = supportedLocales.en ? { key: 'en', locale: supportedLocales.en } : { key, locale: supportedLocales[key] };
         let locale = supportedLocales[
-            LocaleUtils.normalizeLocaleCode(query.locale || (navigator ? navigator.language || navigator.browserLanguage : "en"))
+            LocaleUtils.normalizeLocaleCode(query.locale || (navigator ? navigator.language || navigator.browserLanguage : defaultLocale.key))
         ];
-        return locale ? locale.code : "en-US";
+        return locale ? locale.code : defaultLocale.locale.code;
     },
     getSupportedLocales: function() {
         return supportedLocales;