From b465b924e214d2aba98a29214c05bd39f0dea80c Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 15 Feb 2023 14:08:09 +0400 Subject: [PATCH 1/3] [SSE mobile] Correct output of formula examples --- apps/spreadsheeteditor/mobile/locale/en.json | 38 +++++++++---------- .../settings/ApplicationSettings.jsx | 5 ++- .../mobile/src/store/applicationSettings.js | 21 ++++++++++ 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index c89f7a83e1..9fa641eaac 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -747,27 +747,27 @@ "txtTr": "Turkish", "txtUk": "Ukrainian", "txtVi": "Vietnamese", - "txtExampleEn": "SUM; MIN; MAX; COUNT", - "txtExampleDe": "SUMME; MIN; MAX; ANZAHL", - "txtExampleRu": "СУММ; МИН; МАКС; СЧЁТ", - "txtExamplePl": "SUMA; MIN; MAX; ILE.LICZB", - "txtExampleEs": "SUMA; MIN; MAX; CALCULAR", - "txtExampleFr": "SOMME; MIN; MAX; NB", - "txtExampleIt": "SOMMA; MIN; MAX; CONTA.NUMERI", + "del_txtExampleEn": "SUM; MIN; MAX; COUNT", + "del_txtExampleDe": "SUMME; MIN; MAX; ANZAHL", + "del_txtExampleRu": "СУММ; МИН; МАКС; СЧЁТ", + "del_txtExamplePl": "SUMA; MIN; MAX; ILE.LICZB", + "del_txtExampleEs": "SUMA; MIN; MAX; CALCULAR", + "del_txtExampleFr": "SOMME; MIN; MAX; NB", + "del_txtExampleIt": "SOMMA; MIN; MAX; CONTA.NUMERI", "strFuncLocale": "Formula Language", "strFuncLocaleEx": "Example: SUM; MIN; MAX; COUNT", - "txtExampleBe": "СУММ; МИН; МАКС; СЧЁТ", - "txtExampleCa": "SUMA; MIN; MAX; COMPT", - "txtExampleCs": "SUMA; MIN; MAX; POČET", - "txtExampleDa": "SUM; MIN; MAKS; TÆL", - "txtExampleNl": "SOM; MIN; MAX; AANTAL", - "txtExampleFi": "SUMMA; MIN; MAKS; LASKE", - "txtExampleHu": "SZUM; MIN; MAX; DARAB", - "txtExampleNb": "SUMMER; MIN; STØRST; ANTALL", - "txtExamplePt": "SOMA; MÍNIMO; MÁXIMO; CONTAR", - "txtExamplePtbr": "SOMA; MÍNIMO; MÁXIMO; CONT.NÚM", - "txtExampleSv": "SUMMA; MIN; MAX; ANTAL", - "txtExampleTr": "TOPLA; MİN; MAK; BAĞ_DEĞ_SAY" + "del_txtExampleBe": "СУММ; МИН; МАКС; СЧЁТ", + "del_txtExampleCa": "SUMA; MIN; MAX; COMPT", + "del_txtExampleCs": "SUMA; MIN; MAX; POČET", + "del_txtExampleDa": "SUM; MIN; MAKS; TÆL", + "del_txtExampleNl": "SOM; MIN; MAX; AANTAL", + "del_txtExampleFi": "SUMMA; MIN; MAKS; LASKE", + "del_txtExampleHu": "SZUM; MIN; MAX; DARAB", + "del_txtExampleNb": "SUMMER; MIN; STØRST; ANTALL", + "del_txtExamplePt": "SOMA; MÍNIMO; MÁXIMO; CONTAR", + "del_txtExamplePtbr": "SOMA; MÍNIMO; MÁXIMO; CONT.NÚM", + "del_txtExampleSv": "SUMMA; MIN; MAX; ANTAL", + "del_txtExampleTr": "TOPLA; MİN; MAK; BAĞ_DEĞ_SAY" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx index 8db569867f..db74dacfd8 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx @@ -24,6 +24,7 @@ class ApplicationSettingsController extends Component { const { t } = this.props; const _t = t("View.Settings", { returnObjects: true }); const storeApplicationSettings = this.props.storeApplicationSettings; + const formulaLangsExamples = storeApplicationSettings.formulaLangsExamples; const formulaLangs = storeApplicationSettings.formulaLangs; const formulaLangsCollection = formulaLangs.map(lang => { let str = lang.replace(/[\-_]/, ''); @@ -31,11 +32,11 @@ class ApplicationSettingsController extends Component { return { value: lang, - displayValue: _t[`txt${str}lang`] ? t(`View.Settings.txt${str}lang`) : t(`View.Settings.txt${str}`), exampleValue: _t[`txtExample${str}`] ? t(`View.Settings.txtExample${str}`) : t('View.Settings.txtExampleEn') + displayValue: _t[`txt${str}lang`] ? t(`View.Settings.txt${str}lang`) : t(`View.Settings.txt${str}`), exampleValue: formulaLangsExamples[`txtExample${str}`] || formulaLangsExamples['txtExampleEn'] } }); - formulaLangsCollection.sort(function(a, b){ + formulaLangsCollection.sort(function(a, b) { if (a.displayValue < b.displayValue) return -1; if (a.displayValue > b.displayValue) return 1; return 0; diff --git a/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js b/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js index 61945b0867..201c8daa6c 100644 --- a/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js +++ b/apps/spreadsheeteditor/mobile/src/store/applicationSettings.js @@ -44,6 +44,27 @@ export class storeApplicationSettings { isComments = true; isResolvedComments = true; formulaLangs = ['en', 'be', 'bg', 'ca', 'zh', 'cs', 'da', 'nl', 'fi', 'fr', 'de', 'el', 'hu', 'id', 'it', 'ja', 'ko', 'lv', 'lo', 'nb', 'pl', 'pt-br', 'pt', 'ro', 'ru', 'sk', 'sl', 'sv', 'es', 'tr', 'uk', 'vi']; + formulaLangsExamples = { + 'txtExampleEn': 'SUM; MIN; MAX; COUNT', + 'txtExampleDe': 'SUMME; MIN; MAX; ANZAHL', + 'txtExampleRu': 'СУММ; МИН; МАКС; СЧЁТ', + 'txtExamplePl': 'SUMA; MIN; MAX; ILE.LICZB', + 'txtExampleEs': 'SUMA; MIN; MAX; CALCULAR', + 'txtExampleFr': 'SOMME; MIN; MAX; NB', + 'txtExampleIt': 'SOMMA; MIN; MAX; CONTA.NUMERI', + 'txtExampleBe': 'СУММ; МИН; МАКС; СЧЁТ', + 'txtExampleCa': 'SUMA; MIN; MAX; COMPT', + 'txtExampleCs': 'SUMA; MIN; MAX; POČET', + 'txtExampleDa': 'SUM; MIN; MAKS; TÆL', + 'txtExampleNl': 'SOM; MIN; MAX; AANTAL', + 'txtExampleFi': 'SUMMA; MIN; MAKS; LASKE', + 'txtExampleHu': 'SZUM; MIN; MAX; DARAB', + 'txtExampleNb': 'SUMMER; MIN; STØRST; ANTALL', + 'txtExamplePt': 'SOMA; MÍNIMO; MÁXIMO; CONTAR', + 'txtExamplePtbr': 'SOMA; MÍNIMO; MÁXIMO; CONT.NÚM', + 'txtExampleSv': 'SUMMA; MIN; MAX; ANTAL', + 'txtExampleTr': 'TOPLA; MİN; MAK; BAĞ_DEĞ_SAY' + } formulaLangsColection = []; changeDirectionMode(value) { From a0dac2c81a99e86b703b89cf7981e49a64d6a22d Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 15 Feb 2023 17:38:26 +0400 Subject: [PATCH 2/3] [PE SSE mobile] Fix Bug 61135 --- .../mobile/src/view/settings/Settings.jsx | 16 ++++++++++------ .../mobile/src/view/settings/Settings.jsx | 16 ++++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index d302d6ae53..6b232c5829 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -197,12 +197,16 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( - - - - - - + {_canHelp && + + + + } + {_canAbout && + + + + } diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index 6950042cd3..e82ecb125e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -207,12 +207,16 @@ const SettingsList = inject("storeAppOptions")(observer(props => { - - - - - - + {_canHelp && + + + + } + {_canAbout && + + + + } From 2f109b88404583eb4fe2dccd981d11009e2d3f9f Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 15 Feb 2023 17:49:23 +0400 Subject: [PATCH 3/3] [DE PE SSE mobile] Fix Bug 61123 --- .../mobile/src/view/settings/Settings.jsx | 19 +++++++++++++------ .../mobile/src/view/settings/Settings.jsx | 18 ++++++++++++------ .../mobile/src/view/settings/Settings.jsx | 18 ++++++++++++------ 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index 9ffb8d90a8..9400bc7bfc 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -122,7 +122,9 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => _canDownloadOrigin = false, _canAbout = true, _canHelp = true, - _canPrint = false; + _canPrint = false, + _canFeedback = true; + if (appOptions.isDisconnected) { _isEdit = false; if (!appOptions.enableDownload) @@ -132,11 +134,14 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => _canDownload = appOptions.canDownload; _canDownloadOrigin = appOptions.canDownloadOrigin; _canPrint = appOptions.canPrint; + if (appOptions.customization && appOptions.canBrandingExt) { - _canAbout = (appOptions.customization.about!==false); + _canAbout = appOptions.customization.about !== false; } + if (appOptions.customization) { - _canHelp = (appOptions.customization.help!==false); + _canHelp = appOptions.customization.help !== false; + _canFeedback = appOptions.customization.feedback !== false; } } @@ -216,9 +221,11 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => } - - - + {_canFeedback && + + + + } diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index 6b232c5829..e79f43ab0a 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -130,7 +130,8 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( _canDownloadOrigin = false, _canAbout = true, _canHelp = true, - _canPrint = false; + _canPrint = false, + _canFeedback = true; if (appOptions.isDisconnected) { _isEdit = false; @@ -141,11 +142,14 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( _canDownload = appOptions.canDownload; _canDownloadOrigin = appOptions.canDownloadOrigin; _canPrint = appOptions.canPrint; + if (appOptions.customization && appOptions.canBrandingExt) { - _canAbout = (appOptions.customization.about!==false); + _canAbout = appOptions.customization.about !== false; } + if (appOptions.customization) { - _canHelp = (appOptions.customization.help!==false); + _canHelp = appOptions.customization.help !== false; + _canFeedback = appOptions.customization.feedback !== false; } } @@ -207,9 +211,11 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( } - - - + {_canFeedback && + + + + } diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index e82ecb125e..f1896581cb 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -140,7 +140,8 @@ const SettingsList = inject("storeAppOptions")(observer(props => { _canDownloadOrigin = false, _canAbout = true, _canHelp = true, - _canPrint = false; + _canPrint = false, + _canFeedback = true; if (appOptions.isDisconnected) { _isEdit = false; @@ -151,11 +152,14 @@ const SettingsList = inject("storeAppOptions")(observer(props => { _canDownload = appOptions.canDownload; _canDownloadOrigin = appOptions.canDownloadOrigin; _canPrint = appOptions.canPrint; + if (appOptions.customization && appOptions.canBrandingExt) { - _canAbout = (appOptions.customization.about!==false); + _canAbout = appOptions.customization.about !== false; } + if (appOptions.customization) { - _canHelp = (appOptions.customization.help!==false); + _canHelp = appOptions.customization.help !== false; + _canFeedback = appOptions.customization.feedback !== false; } } @@ -217,9 +221,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => { } - - - + {_canFeedback && + + + + }