Merge pull request #2213 from xiaojay/dev

Fix bug when determining locale
galaxyproject · Apr 21, 2016 · 266a45a · 266a45a
2 parents be58822 + 18dcf10
commit 266a45a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/client/galaxy/scripts/utils/localization.js b/client/galaxy/scripts/utils/localization.js
@@ -13,7 +13,7 @@ if( localeStrings.hasOwnProperty( '__root' ) ){
         typeof navigator === 'undefined' ? '__root'
             : ( navigator.language || navigator.userLanguage || '__root' ).toLowerCase()
     );
-    localeStrings = localeStrings[ '__' + locale ] || localeStrings.__root;
+    localeStrings = localeStrings[ '__' + locale ] || localeStrings[ '__' + locale.split('-')[0] ] ||localeStrings.__root;
 
 // } else {
 //     console.debug( 'i18n+requirejs localization for ' + locale + ' loaded' );

diff --git a/static/maps/utils/localization.js.map b/static/maps/utils/localization.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/utils/localization.js b/static/scripts/utils/localization.js