pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 08:16:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] By bug 62959 (fix lang condition)

Browse Source
This commit is contained in:
JuliaSvinareva
2023-07-05 12:26:48 +03:00
parent 4180f1e09c
commit 160cf97d76
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Toolbar.js
View File

@ -3413,9 +3413,9 @@ define([
var me = this;
me.appOptions = config;
var lang = config.lang ? config.lang.toLowerCase() : 'en';
lang = lang.split(/[\-_]/)[0];
if (lang === 'zh') {
var lang = config.lang ? config.lang.toLowerCase() : 'en',
langPrefix = lang.split(/[\-_]/)[0];
if (langPrefix === 'zh' && lang !== 'zh-tw') {
me._state.type_fontsize = 'string';
}

42
apps/documenteditor/main/app/view/Toolbar.js
View File

@ -1762,27 +1762,9 @@ define([
onAppReady: function (config) {
var me = this;
if (me.cmbFontSize) {
var lang = config.lang ? config.lang.toLowerCase() : 'en';
lang = lang.split(/[\-_]/)[0];
var fontSizeData = lang !== 'zh' ? [
{value: 8, displayValue: "8"},
{value: 9, displayValue: "9"},
{value: 10, displayValue: "10"},
{value: 11, displayValue: "11"},
{value: 12, displayValue: "12"},
{value: 14, displayValue: "14"},
{value: 16, displayValue: "16"},
{value: 18, displayValue: "18"},
{value: 20, displayValue: "20"},
{value: 22, displayValue: "22"},
{value: 24, displayValue: "24"},
{value: 26, displayValue: "26"},
{value: 28, displayValue: "28"},
{value: 36, displayValue: "36"},
{value: 48, displayValue: "48"},
{value: 72, displayValue: "72"},
{value: 96, displayValue: "96"}
] : [
var lang = config.lang ? config.lang.toLowerCase() : 'en',
langPrefix = lang.split(/[\-_]/)[0];
var fontSizeData = (langPrefix === 'zh' && lang !== 'zh-tw') ? [
{value: '42_str', displayValue: "初号"},
{value: '36_str', displayValue: "小初"},
{value: '26_str', displayValue: "一号"},
@ -1815,6 +1797,24 @@ define([
{value: 26, displayValue: "26"},
{value: 36, displayValue: "36"},
{value: 42, displayValue: "42"}
] : [
{value: 8, displayValue: "8"},
{value: 9, displayValue: "9"},
{value: 10, displayValue: "10"},
{value: 11, displayValue: "11"},
{value: 12, displayValue: "12"},
{value: 14, displayValue: "14"},
{value: 16, displayValue: "16"},
{value: 18, displayValue: "18"},
{value: 20, displayValue: "20"},
{value: 22, displayValue: "22"},
{value: 24, displayValue: "24"},
{value: 26, displayValue: "26"},
{value: 28, displayValue: "28"},
{value: 36, displayValue: "36"},
{value: 48, displayValue: "48"},
{value: 72, displayValue: "72"},
{value: 96, displayValue: "96"}
];
me.cmbFontSize.setData(fontSizeData);
}