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 d302d6ae53..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; } } @@ -197,15 +201,21 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( - - - - - - - - - + {_canHelp && + + + + } + {_canAbout && + + + + } + {_canFeedback && + + + + } 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) { diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index 6950042cd3..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; } } @@ -207,15 +211,21 @@ const SettingsList = inject("storeAppOptions")(observer(props => { - - - - - - - - - + {_canHelp && + + + + } + {_canAbout && + + + + } + {_canFeedback && + + + + }