Support for languages with "_" separator (en_US).

apps/common/locale.js

@@ -100,7 +100,7 @@ Common.Locale = new(function() {
         var langParam = _getUrlParameterByName('lang');
         var xhrObj = _createXMLHTTPObject();
         if (xhrObj && langParam) {
-            var lang = langParam.split("-")[0];
+            var lang = langParam.split(/[\-\_]/)[0];
             xhrObj.open('GET', 'locale/' + lang + '.json', false);
             xhrObj.send('');
             l10n = eval("(" + xhrObj.responseText + ")");

apps/documenteditor/embed/index.html

@@ -233,7 +233,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/documenteditor/embed/index.html.deploy

@@ -225,7 +225,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/documenteditor/main/app/view/FileMenuPanels.js

@@ -1075,7 +1075,7 @@ define([
             var me = this;
             var store = this.viewHelpPicker.store;
             if (lang) {
-                lang = lang.split("-")[0];
+                lang = lang.split(/[\-\_]/)[0];
                 var config = {
                     dataType: 'json',
                     error: function () {

apps/documenteditor/main/index.html

@@ -219,7 +219,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/documenteditor/main/index.html.deploy

@@ -218,7 +218,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/documenteditor/mobile/index.html

@@ -206,7 +206,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/documenteditor/mobile/index.html.deploy

@@ -205,7 +205,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/presentationeditor/embed/index.html

@@ -232,7 +232,7 @@
           }
 
           var params = getUrlParams(),
-              lang = (params["lang"] || 'en').split("-")[0],
+              lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
               customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
               margin = (customer !== '') ? 50 : 20,
               loading = 'Loading...',

apps/presentationeditor/embed/index.html.deploy

@@ -225,7 +225,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/presentationeditor/main/app/view/FileMenuPanels.js

@@ -849,7 +849,7 @@ define([
             var me = this;
             var store = this.viewHelpPicker.store;
             if (lang) {
-                lang = lang.split("-")[0];
+                lang = lang.split(/[\-\_]/)[0];
                 var config = {
                     dataType: 'json',
                     error: function () {

apps/presentationeditor/main/index.html

@@ -218,7 +218,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/presentationeditor/main/index.html.deploy

@@ -218,7 +218,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/presentationeditor/main/index.reporter.html

@@ -222,7 +222,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/presentationeditor/main/index.reporter.html.deploy

@@ -218,7 +218,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/presentationeditor/mobile/index.html

@@ -206,7 +206,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/presentationeditor/mobile/index.html.deploy

@@ -205,7 +205,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/spreadsheeteditor/embed/index.html

@@ -233,7 +233,7 @@
           }
 
           var params = getUrlParams(),
-              lang = (params["lang"] || 'en').split("-")[0],
+              lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
               customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
               margin = (customer !== '') ? 50 : 20,
               loading = 'Loading...',

apps/spreadsheeteditor/embed/index.html.deploy

@@ -225,7 +225,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -320,7 +320,7 @@ define([
 
                 value = Common.localStorage.getItem("sse-settings-func-locale");
                 if (value===null) {
-                    var lang = ((this.editorConfig.lang) ? this.editorConfig.lang : 'en').split("-")[0].toLowerCase();
+                    var lang = ((this.editorConfig.lang) ? this.editorConfig.lang : 'en').split(/[\-\_]/)[0].toLowerCase();
                     Common.Utils.InternalSettings.set("sse-settings-func-locale", lang);
                     if (lang !== 'en')
                         value = SSE.Views.FormulaLang.get(lang);

apps/spreadsheeteditor/main/app/view/FileMenuPanels.js

@@ -732,7 +732,7 @@ define([
             value = Common.Utils.InternalSettings.get("sse-settings-func-locale");
             item = this.cmbFuncLocale.store.findWhere({value: value});
             if (!item)
-                item = this.cmbFuncLocale.store.findWhere({value: value.split("-")[0]});
+                item = this.cmbFuncLocale.store.findWhere({value: value.split(/[\-\_]/)[0]});
             this.cmbFuncLocale.setValue(item ? item.get('value') : 'en');
             this.updateFuncExample(item ? item.get('exampleValue') : this.txtExampleEn);
 
@@ -1304,7 +1304,7 @@ define([
             var me = this;
             var store = this.viewHelpPicker.store;
             if (lang) {
-                lang = lang.split("-")[0];
+                lang = lang.split(/[\-\_]/)[0];
                 var config = {
                     dataType: 'json',
                     error: function () {

apps/spreadsheeteditor/main/index.html

@@ -217,7 +217,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/spreadsheeteditor/main/index.html.deploy

@@ -217,7 +217,7 @@
         }
 
         var params = getUrlParams(),
-            lang = (params["lang"] || 'en').split("-")[0],
+            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
             customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
             margin = (customer !== '') ? 50 : 20,
             loading = 'Loading...',

apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js

@@ -87,7 +87,7 @@ define([
 
                 _.defer(function () {
                     var editorLang = SSE.getController("Main").editorConfig.lang;
-                    editorLang = (editorLang ? editorLang : 'en').split("-")[0].toLowerCase();
+                    editorLang = (editorLang ? editorLang : 'en').split(/[\-\_]/)[0].toLowerCase();
 
                     var localizationFunctions = function(data) {
                         fc = data;
@@ -108,7 +108,7 @@ define([
                     functions = {},
                     editorLang = SSE.getController("Main").editorConfig.lang;
 
-                editorLang = (editorLang ? editorLang : 'en').split("-")[0].toLowerCase();
+                editorLang = (editorLang ? editorLang : 'en').split(/[\-\_]/)[0].toLowerCase();
 
                 var localizationFunctionsDesc = function (data) {
                     var jsonDesc = {},

apps/spreadsheeteditor/mobile/index.html

@@ -207,7 +207,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',

apps/spreadsheeteditor/mobile/index.html.deploy

@@ -204,7 +204,7 @@
             }
 
             var params = getUrlParams(),
-                lang = (params["lang"] || 'en').split("-")[0],
+                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
                 customer = params["customer"] ? ('<div class="loader-page-text-customer">' + encodeUrlParam(params["customer"]) + '</div>') : '',
                 margin = (customer !== '') ? 50 : 20,
                 loading = 'Loading...',