diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 5de13e3d1..b9bbfbf16 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -874,45 +874,52 @@ define([ ] }); + var formula_arr = [ + { value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn }, + { value: 'be', displayValue: this.txtBe, exampleValue: this.txtExampleBe }, + { value: 'bg', displayValue: this.txtBg, exampleValue: this.txtExampleEn }, + { value: 'ca', displayValue: this.txtCa, exampleValue: this.txtExampleCa }, + { value: 'zh', displayValue: this.txtZh, exampleValue: this.txtExampleEn }, + { value: 'cs', displayValue: this.txtCs, exampleValue: this.txtExampleCs }, + { value: 'da', displayValue: this.txtDa, exampleValue: this.txtExampleDa }, + { value: 'nl', displayValue: this.txtNl, exampleValue: this.txtExampleNl }, + { value: 'fi', displayValue: this.txtFi, exampleValue: this.txtExampleFi }, + { value: 'fr', displayValue: this.txtFr, exampleValue: this.txtExampleFr }, + { value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe }, + { value: 'el', displayValue: this.txtEl, exampleValue: this.txtExampleEn }, + { value: 'hu', displayValue: this.txtHu, exampleValue: this.txtExampleHu }, + { value: 'id', displayValue: this.txtId, exampleValue: this.txtExampleEn }, + { value: 'it', displayValue: this.txtIt, exampleValue: this.txtExampleIt }, + { value: 'ja', displayValue: this.txtJa, exampleValue: this.txtExampleEn }, + { value: 'ko', displayValue: this.txtKo, exampleValue: this.txtExampleEn }, + { value: 'lv', displayValue: this.txtLv, exampleValue: this.txtExampleEn }, + { value: 'lo', displayValue: this.txtLo, exampleValue: this.txtExampleEn }, + { value: 'nb', displayValue: this.txtNb, exampleValue: this.txtExampleNb }, + { value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }, + { value: 'pt', displayValue: this.txtPtlang, exampleValue: this.txtExamplePt }, + { value: 'ro', displayValue: this.txtRo, exampleValue: this.txtExampleEn }, + { value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu }, + { value: 'sk', displayValue: this.txtSk, exampleValue: this.txtExampleEn }, + { value: 'sl', displayValue: this.txtSl, exampleValue: this.txtExampleEn }, + { value: 'sv', displayValue: this.txtSv, exampleValue: this.txtExampleSv }, + { value: 'es', displayValue: this.txtEs, exampleValue: this.txtExampleEs }, + { value: 'tr', displayValue: this.txtTr, exampleValue: this.txtExampleTr }, + { value: 'uk', displayValue: this.txtUk, exampleValue: this.txtExampleEn }, + { value: 'vi', displayValue: this.txtVi, exampleValue: this.txtExampleEn } + ]; + formula_arr.sort(function(a, b){ + if (a.displayValue < b.displayValue) return -1; + if (a.displayValue > b.displayValue) return 1; + return 0; + }); + this.cmbFuncLocale = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-func-locale'), style : 'width: 160px;', menuStyle: 'max-height: 185px;', editable : false, cls : 'input-group-nr', - data : [ - { value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn }, - { value: 'be', displayValue: this.txtBe, exampleValue: this.txtExampleBe }, - { value: 'bg', displayValue: this.txtBg, exampleValue: this.txtExampleEn }, - { value: 'ca', displayValue: this.txtCa, exampleValue: this.txtExampleCa }, - { value: 'zh', displayValue: this.txtZh, exampleValue: this.txtExampleEn }, - { value: 'cs', displayValue: this.txtCs, exampleValue: this.txtExampleCs }, - { value: 'da', displayValue: this.txtDa, exampleValue: this.txtExampleDa }, - { value: 'nl', displayValue: this.txtNl, exampleValue: this.txtExampleNl }, - { value: 'fi', displayValue: this.txtFi, exampleValue: this.txtExampleFi }, - { value: 'fr', displayValue: this.txtFr, exampleValue: this.txtExampleFr }, - { value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe }, - { value: 'el', displayValue: this.txtEl, exampleValue: this.txtExampleEn }, - { value: 'hu', displayValue: this.txtHu, exampleValue: this.txtExampleHu }, - { value: 'id', displayValue: this.txtId, exampleValue: this.txtExampleEn }, - { value: 'it', displayValue: this.txtIt, exampleValue: this.txtExampleIt }, - { value: 'ja', displayValue: this.txtJa, exampleValue: this.txtExampleEn }, - { value: 'ko', displayValue: this.txtKo, exampleValue: this.txtExampleEn }, - { value: 'lv', displayValue: this.txtLv, exampleValue: this.txtExampleEn }, - { value: 'lo', displayValue: this.txtLo, exampleValue: this.txtExampleEn }, - { value: 'nb', displayValue: this.txtNb, exampleValue: this.txtExampleNb }, - { value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }, - { value: 'pt', displayValue: this.txtPtlang, exampleValue: this.txtExamplePt }, - { value: 'ro', displayValue: this.txtRo, exampleValue: this.txtExampleEn }, - { value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu }, - { value: 'sk', displayValue: this.txtSk, exampleValue: this.txtExampleEn }, - { value: 'sl', displayValue: this.txtSl, exampleValue: this.txtExampleEn }, - { value: 'sv', displayValue: this.txtSv, exampleValue: this.txtExampleSv }, - { value: 'es', displayValue: this.txtEs, exampleValue: this.txtExampleEs }, - { value: 'tr', displayValue: this.txtTr, exampleValue: this.txtExampleTr }, - { value: 'uk', displayValue: this.txtUk, exampleValue: this.txtExampleEn }, - { value: 'vi', displayValue: this.txtVi, exampleValue: this.txtExampleEn } - ] + data : formula_arr }).on('selected', function(combo, record) { me.updateFuncExample(record.exampleValue); }); diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 2f930d3e4..1cb861577 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -1947,6 +1947,30 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Показывать уведомление", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Отключить все макросы с уведомлением", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "как Windows", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBe": "Белорусский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBg": "Болгарский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCa": "Каталонский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Китайский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCs": "Чешский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDa": "Датский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNl": "Голландский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtFi": "Финский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEl": "Греческий", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtHu": "Венгерский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtId": "Индонезийский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtJa": "Японский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtKo": "Корейский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLv": "Латышский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLo": "Лаосский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNb": "Норвежский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtlang": "Португальский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRo": "Румынский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtSk": "Словацкий", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtSl": "Словенский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtSv": "Шведский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtTr": "Турецкий", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtUk": "Украинский", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtVi": "Вьетнамский", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.okButtonText": "Применить", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Язык словаря", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Пропускать слова из ПРОПИСНЫХ БУКВ",