Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Julia Radzhabova 2018-01-24 14:40:59 +03:00
parent 5cf94b8ca9
commit b7675946f8
26 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/locale.js
View file

@ -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 + ")");

2
apps/documenteditor/embed/index.html
View file

@ -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...',

2
apps/documenteditor/embed/index.html.deploy
View file

@ -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...',

2
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -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 () {

2
apps/documenteditor/main/index.html
View file

@ -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...',

2
apps/documenteditor/main/index.html.deploy
View file

@ -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...',

2
apps/documenteditor/mobile/index.html
View file

@ -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...',

2
apps/documenteditor/mobile/index.html.deploy
View file

@ -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...',

2
apps/presentationeditor/embed/index.html
View file

@ -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...',

2
apps/presentationeditor/embed/index.html.deploy
View file

@ -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...',

2
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -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 () {

2
apps/presentationeditor/main/index.html
View file

@ -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...',

2
apps/presentationeditor/main/index.html.deploy
View file

@ -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...',

2
apps/presentationeditor/main/index.reporter.html
View file

@ -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...',

2
apps/presentationeditor/main/index.reporter.html.deploy
View file

@ -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...',

2
apps/presentationeditor/mobile/index.html
View file

@ -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...',

2
apps/presentationeditor/mobile/index.html.deploy
View file

@ -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...',

2
apps/spreadsheeteditor/embed/index.html
View file

@ -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...',

2
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -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...',

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

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

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -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 () {

2
apps/spreadsheeteditor/main/index.html
View file

@ -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...',

2
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -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...',

4
apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js
View file

@ -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 = {},

2
apps/spreadsheeteditor/mobile/index.html
View file

@ -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...',

2
apps/spreadsheeteditor/mobile/index.html.deploy
View file

@ -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...',