From 99d33c2c5cf3e86e33c2abf8619cee471ecf63ac Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 19 May 2021 23:54:27 +0300 Subject: [PATCH 1/2] Bug 50447 --- apps/documenteditor/main/app/view/Toolbar.js | 9 +++++---- apps/presentationeditor/main/app/view/Toolbar.js | 9 +++++---- apps/spreadsheeteditor/main/app/view/Toolbar.js | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 76b0d9fe5a..3b3ebca591 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -82,7 +82,7 @@ define([ * UI Components */ - this.SchemeNames = [ + this.SchemeNames = [ this.txtScheme22, this.txtScheme1, this.txtScheme2, this.txtScheme3, this.txtScheme4, this.txtScheme5, this.txtScheme6, this.txtScheme7, this.txtScheme8, this.txtScheme9, this.txtScheme10, this.txtScheme11, this.txtScheme12, this.txtScheme13, this.txtScheme14, this.txtScheme15, @@ -2130,7 +2130,7 @@ define([ schemecolors.push(clr); } - if (index == 21) { + if (index == 22) { this.mnuColorSchema.addItem({ caption: '--' }); @@ -2140,7 +2140,7 @@ define([ template: itemTemplate, cls: 'color-schemas-menu', colors: schemecolors, - caption: (index < 21) ? (me.SchemeNames[index] || name) : name, + caption: (index < 22) ? (me.SchemeNames[index] || name) : name, value: index, checkable: true, toggleGroup: 'menuSchema' @@ -2471,7 +2471,8 @@ define([ mniCapitalizeWords: 'Capitalize Each Word', mniToggleCase: 'tOGGLE cASE', textChangeLevel: 'Change List Level', - mniTextToTable: 'Convert Text to Table' + mniTextToTable: 'Convert Text to Table', + txtScheme22: 'New Office' } })(), DE.Views.Toolbar || {})); }); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 2cfc5e3534..8fc62a9cd2 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -104,7 +104,7 @@ define([ me.synchTooltip = undefined; me.needShowSynchTip = false; - me.SchemeNames = [ + me.SchemeNames = [me.txtScheme22, me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5, me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10, me.txtScheme11, me.txtScheme12, me.txtScheme13, me.txtScheme14, me.txtScheme15, @@ -1444,7 +1444,7 @@ define([ schemecolors.push(clr); } - if (index == 21) { + if (index == 22) { mnuColorSchema.addItem({ caption: '--' }); @@ -1454,7 +1454,7 @@ define([ template: itemTemplate, cls: 'color-schemas-menu', colors: schemecolors, - caption: (index < 21) ? (me.SchemeNames[index] || name) : name, + caption: (index < 22) ? (me.SchemeNames[index] || name) : name, value: index, checkable: true, toggleGroup: 'menuSchema' @@ -1815,7 +1815,8 @@ define([ mniCapitalizeWords: 'Capitalize Each Word', mniToggleCase: 'tOGGLE cASE', strMenuNoFill: 'No Fill', - tipHighlightColor: 'Highlight color' + tipHighlightColor: 'Highlight color', + txtScheme22: 'New Office' } }()), PE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 54e6b0f389..444f1e4592 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -116,7 +116,7 @@ define([ var me = this, options = {}; - me.SchemeNames = [ + me.SchemeNames = [me.txtScheme22, me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5, me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10, me.txtScheme11, me.txtScheme12, me.txtScheme13, me.txtScheme14, me.txtScheme15, @@ -2263,7 +2263,7 @@ define([ schemecolors.push(clr); } - if (index == 21) { + if (index == 22) { this.mnuColorSchema.addItem({ caption : '--' }); @@ -2273,7 +2273,7 @@ define([ template: itemTemplate, cls : 'color-schemas-menu', colors : schemecolors, - caption: (index < 21) ? (me.SchemeNames[index] || name) : name, + caption: (index < 22) ? (me.SchemeNames[index] || name) : name, value: index, checkable: true, toggleGroup: 'menuSchema' @@ -2694,6 +2694,7 @@ define([ textAutoColor: 'Automatic', textItems: 'Items', tipInsertSpark: 'Insert sparkline', - capInsertSpark: 'Sparklines' + capInsertSpark: 'Sparklines', + txtScheme22: 'New Office' }, SSE.Views.Toolbar || {})); }); \ No newline at end of file From a405a14afc4fcc187d47b941e3e76006f8202ae6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 19 May 2021 23:59:47 +0300 Subject: [PATCH 2/2] Update translation --- apps/documenteditor/main/locale/en.json | 1 + apps/presentationeditor/main/locale/en.json | 1 + apps/spreadsheeteditor/main/locale/en.json | 1 + 3 files changed, 3 insertions(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 6476da0f43..acc8433d04 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2719,6 +2719,7 @@ "DE.Views.Toolbar.txtScheme2": "Grayscale", "DE.Views.Toolbar.txtScheme20": "Urban", "DE.Views.Toolbar.txtScheme21": "Verve", + "DE.Views.Toolbar.txtScheme22": "New Office", "DE.Views.Toolbar.txtScheme3": "Apex", "DE.Views.Toolbar.txtScheme4": "Aspect", "DE.Views.Toolbar.txtScheme5": "Civic", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 4ebc14728f..f96525ac9f 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1988,6 +1988,7 @@ "PE.Views.Toolbar.txtScheme2": "Grayscale", "PE.Views.Toolbar.txtScheme20": "Urban", "PE.Views.Toolbar.txtScheme21": "Verve", + "PE.Views.Toolbar.txtScheme22": "New Office", "PE.Views.Toolbar.txtScheme3": "Apex", "PE.Views.Toolbar.txtScheme4": "Aspect", "PE.Views.Toolbar.txtScheme5": "Civic", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 2f0c2043b0..5453b67404 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -3304,6 +3304,7 @@ "SSE.Views.Toolbar.txtScheme2": "Grayscale", "SSE.Views.Toolbar.txtScheme20": "Urban", "SSE.Views.Toolbar.txtScheme21": "Verve", + "SSE.Views.Toolbar.txtScheme22": "New Office", "SSE.Views.Toolbar.txtScheme3": "Apex", "SSE.Views.Toolbar.txtScheme4": "Aspect", "SSE.Views.Toolbar.txtScheme5": "Civic",