From 160cf97d76c56ba2e41fd484776bd20fcf412dd2 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 5 Jul 2023 12:26:48 +0300 Subject: [PATCH] [DE] By bug 62959 (fix lang condition) --- .../main/app/controller/Toolbar.js | 6 +-- apps/documenteditor/main/app/view/Toolbar.js | 42 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index f624fc39c5..870fa07aa0 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -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'; } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 774daba4ff..2183128e3b 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -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); }