From b819a5c0df8f66aca612244a5c3bc7036f944222 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Feb 2017 18:16:17 +0300 Subject: [PATCH] [DE] Fix Bug 33889. --- .../documenteditor/main/app/controller/Main.js | 18 +++++++++++++++++- .../main/app/controller/Statusbar.js | 13 ++----------- .../main/app/view/DocumentHolder.js | 8 ++++---- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index db8c1de5b..2415f839c 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1651,7 +1651,23 @@ define([ }, loadLanguages: function() { - var langs = this.api.asc_getSpellCheckLanguages(); + var apiLangs = this.api.asc_getSpellCheckLanguages(), + langs = [], info; + _.each(apiLangs, function(lang, index, list){ + info = Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId()); + langs.push({ + title: info[1], + tip: info[0], + code: lang.asc_getId() + }); + }, this); + + langs.sort(function(a, b){ + if (a.tip < b.tip) return -1; + if (a.tip > b.tip) return 1; + return 0; + }); + this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(langs); this.getApplication().getController('Statusbar').setLanguages(langs); }, diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 5f18244ad..ac5233d75 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -144,17 +144,8 @@ define([ /* * */ - setLanguages: function(apiLangs) { - var langs = this.langs = [], info; - _.each(apiLangs, function(lang, index, list){ - info = Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId()); - langs.push({ - title: info[1], - tip: info[0], - code: lang.asc_getId() - }); - }, this); - + setLanguages: function(langs) { + this.langs = langs; this.statusbar.reloadLanguages(langs); }, diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index fe826d425..b447e747c 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -3122,10 +3122,10 @@ define([ if (langs && langs.length > 0) { _.each(langs, function(lang, index){ me.langParaMenu.menu.addItem(new Common.UI.MenuItem({ - caption : Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId())[1], + caption : lang.title, checkable : true, toggleGroup : 'popupparalang', - langid : lang.asc_getId() + langid : lang.code }).on('click', function(item, e){ if (me.api){ if (!_.isUndefined(item.options.langid)) @@ -3139,10 +3139,10 @@ define([ })); me.langTableMenu.menu.addItem(new Common.UI.MenuItem({ - caption : Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId())[1], + caption : lang.title, checkable : true, toggleGroup : 'popuptablelang', - langid : lang.asc_getId() + langid : lang.code }).on('click', function(item, e){ if (me.api){ if (!_.isUndefined(item.options.langid))