pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:59:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v7.3.3' into fix/bugfix

Browse Source
This commit is contained in:
Julia Radzhabova
2023-02-15 20:36:58 +03:00
committed by GitHub
parent c92d93d38b 7de42fa7d5
commit c46a2fec5e
5 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/documenteditor/mobile/src/view/settings/Settings.jsx
View File

@ -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 =>
<Icon slot="media" icon="icon-about"></Icon>
</ListItem>
}
<ListItem title={t('Settings.textFeedback')} link="#" className='no-indicator' onClick={props.showFeedback}>
<Icon slot="media" icon="icon-feedback"></Icon>
</ListItem>
{_canFeedback &&
<ListItem title={t('Settings.textFeedback')} link="#" className='no-indicator' onClick={props.showFeedback}>
<Icon slot="media" icon="icon-feedback"></Icon>
</ListItem>
}
</List>
</Page>
</View>

34
apps/presentationeditor/mobile/src/view/settings/Settings.jsx
View File

@ -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(
<ListItem title={_t.textPresentationInfo} link="#" onClick={onoptionclick.bind(this, "/presentation-info/")}>
<Icon slot="media" icon="icon-info"></Icon>
</ListItem>
<ListItem title={_t.textHelp} link="#" className='no-indicator' onClick={showHelp}>
<Icon slot="media" icon="icon-help"></Icon>
</ListItem>
<ListItem title={_t.textAbout} link="#" onClick={onoptionclick.bind(this, "/about/")}>
<Icon slot="media" icon="icon-about"></Icon>
</ListItem>
<ListItem title={t('View.Settings.textFeedback')} link="#" className='no-indicator' onClick={showFeedback}>
<Icon slot="media" icon="icon-feedback"></Icon>
</ListItem>
{_canHelp &&
<ListItem title={_t.textHelp} link="#" className='no-indicator' onClick={showHelp}>
<Icon slot="media" icon="icon-help"></Icon>
</ListItem>
}
{_canAbout &&
<ListItem title={_t.textAbout} link="#" onClick={onoptionclick.bind(this, "/about/")}>
<Icon slot="media" icon="icon-about"></Icon>
</ListItem>
}
{_canFeedback &&
<ListItem title={t('View.Settings.textFeedback')} link="#" className='no-indicator' onClick={showFeedback}>
<Icon slot="media" icon="icon-feedback"></Icon>
</ListItem>
}
</List>
</Page>
</View>

5
apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View File

@ -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;

21
apps/spreadsheeteditor/mobile/src/store/applicationSettings.js
View File

@ -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) {

34
apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
View File

@ -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 => {
<ListItem title={_t.textSpreadsheetInfo} link="#" onClick={onoptionclick.bind(this, "/spreadsheet-info/")}>
<Icon slot="media" icon="icon-info"></Icon>
</ListItem>
<ListItem title={_t.textHelp} link="#" className='no-indicator' onClick={showHelp}>
<Icon slot="media" icon="icon-help"></Icon>
</ListItem>
<ListItem title={_t.textAbout} link="#" onClick={onoptionclick.bind(this, "/about/")}>
<Icon slot="media" icon="icon-about"></Icon>
</ListItem>
<ListItem title={t('View.Settings.textFeedback')} link="#" className='no-indicator' onClick={showFeedback}>
<Icon slot="media" icon="icon-feedback"></Icon>
</ListItem>
{_canHelp &&
<ListItem title={_t.textHelp} link="#" className='no-indicator' onClick={showHelp}>
<Icon slot="media" icon="icon-help"></Icon>
</ListItem>
}
{_canAbout &&
<ListItem title={_t.textAbout} link="#" onClick={onoptionclick.bind(this, "/about/")}>
<Icon slot="media" icon="icon-about"></Icon>
</ListItem>
}
{_canFeedback &&
<ListItem title={t('View.Settings.textFeedback')} link="#" className='no-indicator' onClick={showFeedback}>
<Icon slot="media" icon="icon-feedback"></Icon>
</ListItem>
}
</List>
</Page>
</View>