use session to store current locale

galaxyproject · Jan 19, 2018 · 1c2bd5f · 1c2bd5f
1 parent c5fa911
commit 1c2bd5f
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 24 deletions.
diff --git a/client/galaxy/scripts/galaxy.js b/client/galaxy/scripts/galaxy.js
@@ -70,6 +70,9 @@ GalaxyApp.prototype._init = function __init(options, bootstrapped) {
     self._initUser(options.user || {});
     self.debug("GalaxyApp.user: ", self.user);
 
+    self._initUserLocale();
+    self.debug("currentLocale: ", sessionStorage.getItem("currentLocale"));
+
     self._setUpListeners();
     self.trigger("ready", self);
 
@@ -171,6 +174,34 @@ GalaxyApp.prototype._initLocale = function _initLocale(options) {
     return self;
 };
 
+/** add the localize fn to this object and the window namespace (as '_l') */
+GalaxyApp.prototype._initUserLocale = function _initUserLocale(options) {
+    var self = this;
+
+    // Choose best locale
+    var global_locale = self.config.default_locale ? self.config.default_locale.toLowerCase() : false;
+
+    var extra_user_preferences = {};
+    if (self.user && self.user.attributes.preferences && 'extra_user_preferences' in self.user.attributes.preferences) {
+        extra_user_preferences = JSON.parse(self.user.attributes.preferences.extra_user_preferences);
+    }
+
+    var user_locale = 'localization|locale' in extra_user_preferences ? extra_user_preferences['localization|locale'].toLowerCase() : false;
+
+    if (user_locale == 'auto') {
+        user_locale = false;
+    }
+
+    var nav_locale =
+        typeof navigator === "undefined"
+            ? "__root"
+            : (navigator.language || navigator.userLanguage || "__root").toLowerCase();
+
+    locale = user_locale || global_locale || nav_locale;
+
+    sessionStorage.setItem('currentLocale', locale);
+};
+
 /** set up the current user as a Backbone model (mvc/user/user-model) */
 GalaxyApp.prototype._initUser = function _initUser(userJSON) {
     var self = this;

diff --git a/client/galaxy/scripts/utils/localization.js b/client/galaxy/scripts/utils/localization.js
@@ -2,35 +2,19 @@ define(["i18n!nls/locale"], function(localeStrings) {
     // =============================================================================
     /** Simple string replacement localization. Language data from galaxy/scripts/nls */
 
-    function onloadLocaleConfig() {
-        // Wait until Galaxy.config is loaded.
-        if (Galaxy.config && localeStrings.hasOwnProperty("__root")) {
-            var global_locale = Galaxy.config.default_locale ? Galaxy.config.default_locale.toLowerCase() : false;
+    if (localeStrings.hasOwnProperty("__root")) {
+        //console.debug( 'amdi18n+webpack localization for ' + locale + ' loaded' );
 
-            var extra_user_preferences = {};
-            if (Galaxy.user && Galaxy.user.attributes.preferences && 'extra_user_preferences' in Galaxy.user.attributes.preferences) {
-                extra_user_preferences = JSON.parse(Galaxy.user.attributes.preferences.extra_user_preferences);
-            }
-
-            var user_locale = 'localization|locale' in extra_user_preferences ? extra_user_preferences['localization|locale'].toLowerCase() : false;
-
-            var nav_locale =
-                typeof navigator === "undefined"
-                    ? "__root"
-                    : (navigator.language || navigator.userLanguage || "__root").toLowerCase();
-
-            console.debug('global_locale: ' + global_locale);
-            console.debug('user_locale: ' + user_locale);
-            console.debug('nav_locale: ' + nav_locale);
+        locale = sessionStorage.getItem("currentLocale");
 
+        if (locale) {
             localeStrings =
-                localeStrings["__" + user_locale] || localeStrings["__" + global_locale] || localeStrings["__" + nav_locale] || localeStrings["__" + nav_locale.split("-")[0]] || localeStrings.__root;
-        } else {
-            setTimeout(onloadLocaleConfig, 100);
+                localeStrings["__" + locale] || localeStrings["__" + locale.split("-")[0]] || localeStrings.__root;
         }
-    }
-    onloadLocaleConfig();
 
+        // } else {
+        //     console.debug( 'i18n+requirejs localization for ' + locale + ' loaded' );
+    }
     // TODO: when this is no longer necessary remove this, i18n.js, and the resolveModule in config
 
     // -----------------------------------------------------------------------------

diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
@@ -604,6 +604,7 @@ def __init__(self, **kwargs):
         self.biostar_enable_bug_reports = string_as_bool(kwargs.get('biostar_enable_bug_reports', True))
         self.biostar_never_authenticate = string_as_bool(kwargs.get('biostar_never_authenticate', False))
         self.pretty_datetime_format = expand_pretty_datetime_format(kwargs.get('pretty_datetime_format', '$locale (UTC)'))
+        self.default_locale = kwargs.get('default_locale', None)
         self.master_api_key = kwargs.get('master_api_key', None)
         if self.master_api_key == "changethis":  # default in sample config file
             raise ConfigurationError("Insecure configuration, please change master_api_key to something other than default (changethis)")

diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
@@ -51,6 +51,7 @@ def _defaults_to(default):
             'lims_doc_url'                      : _defaults_to("https://usegalaxy.org/u/rkchak/p/sts"),
             'biostar_url'                       : _defaults_to(''),
             'biostar_url_redirect'              : lambda *a, **c: self.url_for(controller='biostar', action='biostar_redirect', qualified=True),
+            'default_locale'                    : _defaults_to(self.app.config.default_locale),
 
             'enable_beta_ts_api_install'        : _defaults_to(False),
             'enable_communication_server'       : _defaults_to(False),

diff --git a/templates/webapps/galaxy/galaxy.masthead.mako b/templates/webapps/galaxy/galaxy.masthead.mako
@@ -15,6 +15,7 @@
             'lims_doc_url'              : app.config.get("lims_doc_url", "https://usegalaxy.org/u/rkchak/p/sts"),
             'biostar_url'               : app.config.biostar_url,
             'biostar_url_redirect'      : h.url_for( controller='biostar', action='biostar_redirect', qualified=True ),
+            'default_locale'            : app.config.get("default_locale",  "auto"),
             'support_url'               : app.config.get("support_url", "https://galaxyproject.org/support"),
             'search_url'                : app.config.get("search_url", "http://galaxyproject.org/search/"),
             'mailing_lists'             : app.config.get("mailing_lists", "https://galaxyproject.org/mailing-lists"),