diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js index d4bba6fc0d..147ac305d6 100644 --- a/apps/common/main/lib/view/LanguageDialog.js +++ b/apps/common/main/lib/view/LanguageDialog.js @@ -90,8 +90,11 @@ define([], function () { 'use strict'; '<% _.each(items, function(item) { %>', '
  • ', '', - '', - '<%= scope.getDisplayValue(item) %>', + '
    ', + '', + '<%= item.displayValue %>', + '
    ', + '', '    ', '
    • ', '<% }); %>', @@ -101,6 +104,7 @@ define([], function () { 'use strict'; data: this.options.languages, takeFocusOnClose: true, search: true, + searchFields: ['displayValue', 'displayValueEn'], scrollAlwaysVisible: true }); @@ -155,4 +159,4 @@ define([], function () { 'use strict'; labelSelect : 'Select document language' }, Common.Views.LanguageDialog || {})) -}); \ No newline at end of file +}); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index cfbae959e6..19fef38899 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2722,12 +2722,16 @@ define([ for (var code in allLangs) { if (allLangs.hasOwnProperty(code)) { info = allLangs[code]; - info[2] && langs.push({ - displayValue: info[1], - value: info[0], - code: parseInt(code), - spellcheck: _.indexOf(apiLangs, code)>-1 - }); + if(info[2]) { + var displayName = Common.util.LanguageInfo.getLocalLanguageDisplayName(code); + langs.push({ + displayValue: displayName.native, + displayValueEn: displayName.english, + value: info[0], + code: parseInt(code), + spellcheck: _.indexOf(apiLangs, code)>-1 + }); + } } } diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 7e39b19cd7..c9b23c8d71 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -256,10 +256,11 @@ define([ _onTextLanguage: function(langId) { var info = Common.util.LanguageInfo.getLocalLanguageName(langId); + var displayName = Common.util.LanguageInfo.getLocalLanguageDisplayName(langId); this.statusbar.setLanguage({ - value: info[0], - displayValue: info[1], - code: langId + value: info[0], + displayValue: (displayName ? displayName.native : ''), + code: langId }); }, @@ -372,4 +373,4 @@ define([ textSetTrackChanges: 'You are in Track Changes mode', textDisconnect: 'Connection is lost
    Trying to connect. Please check connection settings.' }, DE.Controllers.Statusbar || {})); -}); \ No newline at end of file +}); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 0878f82d66..1ceca56ac9 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -201,6 +201,7 @@ define([ _.each(langs, function(lang) { var item = { caption : lang.displayValue, + captionEn : lang.displayValueEn, value : lang.value, checkable : true, langid : lang.code, @@ -327,4 +328,4 @@ define([ parseIcons: function() {} }, DE.Views.DocumentHolder || {})); -}); \ No newline at end of file +}); diff --git a/apps/documenteditor/main/app/view/DocumentHolderExt.js b/apps/documenteditor/main/app/view/DocumentHolderExt.js index ad84a157f9..248434743b 100644 --- a/apps/documenteditor/main/app/view/DocumentHolderExt.js +++ b/apps/documenteditor/main/app/view/DocumentHolderExt.js @@ -758,9 +758,12 @@ define([], function () { }); var langTemplate = _.template([ - '', - '', - '<%= caption %>', + '', + '
    ', + '', + '<%= caption %>', + '
    ', + '', '    ' ].join('')); @@ -774,6 +777,7 @@ define([], function () { items : [], itemTemplate: langTemplate, search: true, + searchFields: ['caption', 'captionEn'], focusToCheckedItem: true }) }); @@ -1506,6 +1510,7 @@ define([], function () { items : [], itemTemplate: langTemplate, search: true, + searchFields: ['caption', 'captionEn'], focusToCheckedItem: true }) }); @@ -2241,4 +2246,4 @@ define([], function () { }; } -}); \ No newline at end of file +}); diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 7e28327b40..c0393290b8 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -230,7 +230,7 @@ define([ this.btnLanguage = new Common.UI.Button({ cls : 'btn-toolbar', scaling : false, - caption : 'English (United States)', + caption : 'English – United States', hintAnchor : 'top-left', disabled: true, dataHint : '0', @@ -244,12 +244,16 @@ define([ restoreHeight: 285, itemTemplate: _.template([ '', - '', - '<%= caption %>', + '
    ', + '', + '<%= caption %>', + '
    ', + '', '    ' ].join('')), menuAlign: 'bl-tl', search: true, + searchFields: ['caption', 'captionEn'], focusToCheckedItem: true }); @@ -401,6 +405,7 @@ define([ _.each(array, function(item) { arr.push({ caption : item['displayValue'], + captionEn : item['displayValueEn'], value : {value: item['value'], code: item['code']}, checkable : true, checked : saved == item['displayValue'], @@ -529,4 +534,4 @@ define([ txtSpaces: 'Symbols with spaces' }, DE.Views.Statusbar || {})); } -); \ No newline at end of file +); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 3d3c8f75c3..e8ca4ba85a 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2289,12 +2289,16 @@ define([ for (var code in allLangs) { if (allLangs.hasOwnProperty(code)) { info = allLangs[code]; - info[2] && langs.push({ - displayValue: info[1], - value: info[0], - code: parseInt(code), - spellcheck: _.indexOf(apiLangs, code)>-1 - }); + if(info[2]) { + var displayName = Common.util.LanguageInfo.getLocalLanguageDisplayName(code); + langs.push({ + displayValue: displayName.native, + displayValueEn: displayName.english, + value: info[0], + code: parseInt(code), + spellcheck: _.indexOf(apiLangs, code)>-1 + }); + } } } diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index c08dd73761..f50749eea4 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -194,9 +194,10 @@ define([ _onTextLanguage: function(langId) { var info = Common.util.LanguageInfo.getLocalLanguageName(langId); + var displayName = Common.util.LanguageInfo.getLocalLanguageDisplayName(langId); this.statusbar.setLanguage({ value: info[0], - displayValue: info[1], + displayValue: (displayName ? displayName.native : ''), code: langId }); }, @@ -278,4 +279,4 @@ define([ textDisconnect: 'Connection is lost
    Trying to connect. Please check connection settings.' }, PE.Controllers.Statusbar || {})); -}); \ No newline at end of file +}); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index e28fd30d05..1d0f361a28 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -230,6 +230,7 @@ define([ _.each(langs, function(lang) { var item = { caption : lang.displayValue, + captionEn : lang.displayValueEn, value : lang.value, checkable : true, langid : lang.code, @@ -322,4 +323,4 @@ define([ parseIcons: function() {} }, PE.Views.DocumentHolder || {})); -}); \ No newline at end of file +}); diff --git a/apps/presentationeditor/main/app/view/DocumentHolderExt.js b/apps/presentationeditor/main/app/view/DocumentHolderExt.js index 21c32f4175..538bc61ef8 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolderExt.js +++ b/apps/presentationeditor/main/app/view/DocumentHolderExt.js @@ -668,9 +668,12 @@ define([], function () { }); var langTemplate = _.template([ - '', - '', - '<%= caption %>', + '', + '
    ', + '', + '<%= caption %>', + '
    ', + '', '    ' ].join('')); @@ -684,6 +687,7 @@ define([], function () { items : [], itemTemplate: langTemplate, search: true, + searchFields: ['caption', 'captionEn'], focusToCheckedItem: true }) }); @@ -754,6 +758,7 @@ define([], function () { items : [], itemTemplate: langTemplate, search: true, + searchFields: ['caption', 'captionEn'], focusToCheckedItem: true }) }); @@ -1784,4 +1789,4 @@ define([], function () { this.fireEvent('createdelayedelements', [this, 'edit']); }; } -}); \ No newline at end of file +}); diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 735caf9ca6..cddcdb317b 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -263,12 +263,16 @@ define([ restoreHeight: 285, itemTemplate: _.template([ '', - '', - '<%= caption %>', + '
    ', + '', + '<%= caption %>', + '
    ', + '', '    ' ].join('')), menuAlign: 'bl-tl', search: true, + searchFields: ['caption', 'captionEn'], focusToCheckedItem: true }); @@ -276,7 +280,7 @@ define([ parentEl: $('#btn-cnt-lang', this.el), cls : 'btn-toolbar', scaling : false, - caption : 'English (United States)', + caption : 'English – United States', hint: this.tipSetLang, hintAnchor : 'top-left', disabled: true, @@ -349,6 +353,7 @@ define([ _.each(array, function(item) { arr.push({ caption : item['displayValue'], + captionEn : item['displayValueEn'], value : {value: item['value'], code: item['code']}, checkable : true, checked : saved == item['displayValue'], @@ -418,4 +423,4 @@ define([ textSlideMaster: 'Slide master' }, PE.Views.Statusbar || {})); } -); \ No newline at end of file +);