From dbf70c662a4a62ea60ac7596ae078b03a2d1d60a Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 28 Jun 2021 17:45:02 +0300 Subject: [PATCH] [mobile] Bug 47107 --- apps/documenteditor/mobile/locale/en.json | 22 ++++++++++++++++++- .../src/view/settings/DocumentSettings.jsx | 10 ++++++++- apps/presentationeditor/mobile/locale/en.json | 22 ++++++++++++++++++- .../view/settings/PresentationSettings.jsx | 10 ++++++++- apps/spreadsheeteditor/mobile/locale/en.json | 22 ++++++++++++++++++- .../src/view/settings/SpreadsheetSettings.jsx | 10 ++++++++- 6 files changed, 90 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 0492ef13d..4d0ad3a70 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -340,7 +340,27 @@ "textMarginsW": "Left and right margins are too high for a given page width", "textMarginsH": "Top and bottom margins are too high for a given page height", "textCollaboration": "Collaboration", - "textFindAndReplaceAll": "Find and Replace All" + "textFindAndReplaceAll": "Find and Replace All", + "txtScheme1": "Office", + "txtScheme2": "Grayscale", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme22": "New Office" }, "Edit": { "textClose": "Close", diff --git a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx index b20ad6c11..89111190b 100644 --- a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx @@ -162,6 +162,13 @@ const PageDocumentColorSchemes = props => { const _t = t('Settings', {returnObjects: true}); const storeSettings = props.storeDocumentSettings; const allSchemes = storeSettings.allSchemes; + const SchemeNames = [ + _t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, + _t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, + _t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, + _t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, + _t.txtScheme21, _t.txtScheme22 + ]; return ( @@ -169,8 +176,9 @@ const PageDocumentColorSchemes = props => { { allSchemes ? allSchemes.map((scheme, index) => { + const name = scheme.get_name(); return ( - { if(index !== curScheme) { setScheme(index); diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 381d210e9..8b114090e 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -209,7 +209,27 @@ "textHighlight": "Highlight Results", "textReplace": "Replace", "textNoTextFound": "Text not Found", - "textCollaboration": "Collaboration" + "textCollaboration": "Collaboration", + "txtScheme1": "Office", + "txtScheme2": "Grayscale", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme22": "New Office" }, "Add": { "textSlide": "Slide", diff --git a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx index c8b345505..b04053ca8 100644 --- a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx @@ -38,6 +38,13 @@ const PagePresentationColorSchemes = props => { const _t = t('View.Settings', {returnObjects: true}); const storePresentationSettings = props.storePresentationSettings; const allSchemes = storePresentationSettings.allSchemes; + const SchemeNames = [ + _t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, + _t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, + _t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, + _t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, + _t.txtScheme21, _t.txtScheme22 + ]; return ( @@ -45,8 +52,9 @@ const PagePresentationColorSchemes = props => { { allSchemes ? allSchemes.map((scheme, index) => { + const name = scheme.get_name(); return ( - { if(index !== curScheme) { setScheme(index); diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index a5fe60013..ce0f9d7ef 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -545,7 +545,27 @@ "textValues": "Values", "textNoTextFound": "Text not found", "textReplaceAll": "Replace All", - "textCollaboration": "Collaboration" + "textCollaboration": "Collaboration", + "txtScheme1": "Office", + "txtScheme2": "Grayscale", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme22": "New Office" } }, "Statusbar": { diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx index 47705562d..78feb66f4 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx @@ -11,6 +11,13 @@ const PageSpreadsheetColorSchemes = props => { const _t = t('View.Settings', {returnObjects: true}); const storeSpreadsheetSettings = props.storeSpreadsheetSettings; const allSchemes = storeSpreadsheetSettings.allSchemes; + const SchemeNames = [ + _t.txtScheme1, _t.txtScheme2, _t.txtScheme3, _t.txtScheme4, _t.txtScheme5, + _t.txtScheme6, _t.txtScheme7, _t.txtScheme8, _t.txtScheme9, _t.txtScheme10, + _t.txtScheme11, _t.txtScheme12, _t.txtScheme13, _t.txtScheme14, _t.txtScheme15, + _t.txtScheme16, _t.txtScheme17, _t.txtScheme18, _t.txtScheme19, _t.txtScheme20, + _t.txtScheme21, _t.txtScheme22 + ]; return ( @@ -18,8 +25,9 @@ const PageSpreadsheetColorSchemes = props => { { allSchemes ? allSchemes.map((scheme, index) => { + const name = scheme.get_name(); return ( - { if(index !== curScheme) { setScheme(index);