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

Merge pull request #1926 from ONLYOFFICE/fix/bug-39134

Browse source 
For Bug 39134
This commit is contained in:
maxkadushkin 2022-08-31 19:25:20 +03:00 committed by GitHub
parent b58e53f3fa 2736cfed1b
commit 038167bbff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/locale.js
View file

@ -88,6 +88,10 @@ Common.Locale = new(function() {
return currentLang;
};
var _getDefaultLanguage = function() {
return defLang;
};
var _getLoadedLanguage = function() {
return loadedLang;
};
@ -170,7 +174,8 @@ Common.Locale = new(function() {
return {
apply: _applyLocalization,
get: _get,
getCurrentLanguage: _getCurrentLanguage
getCurrentLanguage: _getCurrentLanguage,
getDefaultLanguage: _getDefaultLanguage
};
})();

2
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -569,7 +569,7 @@ define([
idx = 7;
break;
}
if ('{{DEFAULT_LANG}}' === 'ru') {
if (Common.Locale.getDefaultLanguage() === 'ru') {
if (this._state.bullets.subtype>7 && this._state.bullets.subtype<=11) {
idx = this._state.bullets.subtype;
}

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

@ -210,7 +210,7 @@ define([
{ displayValue: 'i, ii, iii,...', value: Asc.c_oAscNumberingFormat.LowerRoman },
{ displayValue: 'I, II, III,...', value: Asc.c_oAscNumberingFormat.UpperRoman }
];
if ('{{DEFAULT_LANG}}' === 'ru') {
if (Common.Locale.getDefaultLanguage() === 'ru') {
items = items.concat([
{ displayValue: 'а, б, в,...', value: Asc.c_oAscNumberingFormat.RussianLower },
{ displayValue: 'А, Б, В,...', value: Asc.c_oAscNumberingFormat.RussianUpper }

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

@ -2256,7 +2256,7 @@ define([
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true, tip: this.tipNumRoman},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true, tip: this.tipNumRomanSmall}
];
if ('{{DEFAULT_LANG}}' === 'ru') {
if (Common.Locale.getDefaultLanguage() === 'ru') {
items = items.concat([
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 8}, skipRenderOnChange: true, tip: this.tipRusUpperPoints},
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 9}, skipRenderOnChange: true, tip: this.tipRusUpperParentheses},