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

[DE] Fix Bug 33889.

Browse source
This commit is contained in:
Julia Radzhabova 2017-02-07 18:16:17 +03:00
parent 18e5a35d97
commit b819a5c0df
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/documenteditor/main/app/controller/Main.js
View file

@ -1651,7 +1651,23 @@ define([
}, },
loadLanguages: function() { 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('DocumentHolder').getView('DocumentHolder').setLanguages(langs);
this.getApplication().getController('Statusbar').setLanguages(langs); this.getApplication().getController('Statusbar').setLanguages(langs);
}, },

13
apps/documenteditor/main/app/controller/Statusbar.js
View file

@ -144,17 +144,8 @@ define([
/* /*
* */ * */
setLanguages: function(apiLangs) { setLanguages: function(langs) {
var langs = this.langs = [], info; this.langs = langs;
_.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);
this.statusbar.reloadLanguages(langs); this.statusbar.reloadLanguages(langs);
}, },

8
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -3122,10 +3122,10 @@ define([
if (langs && langs.length > 0) { if (langs && langs.length > 0) {
_.each(langs, function(lang, index){ _.each(langs, function(lang, index){
me.langParaMenu.menu.addItem(new Common.UI.MenuItem({ me.langParaMenu.menu.addItem(new Common.UI.MenuItem({
caption : Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId())[1], caption : lang.title,
checkable : true, checkable : true,
toggleGroup : 'popupparalang', toggleGroup : 'popupparalang',
langid : lang.asc_getId() langid : lang.code
}).on('click', function(item, e){ }).on('click', function(item, e){
if (me.api){ if (me.api){
if (!_.isUndefined(item.options.langid)) if (!_.isUndefined(item.options.langid))
@ -3139,10 +3139,10 @@ define([
})); }));
me.langTableMenu.menu.addItem(new Common.UI.MenuItem({ me.langTableMenu.menu.addItem(new Common.UI.MenuItem({
caption : Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId())[1], caption : lang.title,
checkable : true, checkable : true,
toggleGroup : 'popuptablelang', toggleGroup : 'popuptablelang',
langid : lang.asc_getId() langid : lang.code
}).on('click', function(item, e){ }).on('click', function(item, e){
if (me.api){ if (me.api){
if (!_.isUndefined(item.options.langid)) if (!_.isUndefined(item.options.langid))