Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE SSE mobile] Fix Bug 51968

Browse source
This commit is contained in:
SergeyEzhin 2021-08-17 15:49:06 +03:00
parent 7b000e386d
commit d32460ffa8
6 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/mobile/locale/en.json
View file

@ -479,6 +479,7 @@
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",
"textCancel": "Cancel", "textCancel": "Cancel",
"textOk": "Ok",
"textCaseSensitive": "Case Sensitive", "textCaseSensitive": "Case Sensitive",
"textCentimeter": "Centimeter", "textCentimeter": "Centimeter",
"textCollaboration": "Collaboration", "textCollaboration": "Collaboration",

1
apps/documenteditor/mobile/locale/ru.json
View file

@ -479,6 +479,7 @@
"textBack": "Назад", "textBack": "Назад",
"textBottom": "Нижнее", "textBottom": "Нижнее",
"textCancel": "Отмена", "textCancel": "Отмена",
"textOk": "Ок",
"textCaseSensitive": "С учетом регистра", "textCaseSensitive": "С учетом регистра",
"textCentimeter": "Сантиметр", "textCentimeter": "Сантиметр",
"textCollaboration": "Совместная работа", "textCollaboration": "Совместная работа",

36
apps/documenteditor/mobile/src/controller/settings/Download.jsx
View file

@ -27,21 +27,29 @@ class DownloadController extends Component {
if(format) { if(format) {
this.closeModal(); this.closeModal();
if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) { if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) {
f7.dialog.confirm( f7.dialog.create({
(format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf, title: _t.notcriticalErrorTitle,
_t.notcriticalErrorTitle, text: (format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf,
() => { buttons: [
if (format == Asc.c_oAscFileType.TXT) { {
const isDocReady = this.props.storeAppOptions.isDocReady; text: _t.textCancel
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady); },
{
text: _t.textOk,
onClick: () => {
if (format == Asc.c_oAscFileType.TXT) {
const isDocReady = this.props.storeAppOptions.isDocReady;
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady);
}
else {
setTimeout(() => {
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}, 400);
}
}
} }
else { ],
setTimeout(() => { }).open();
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}, 400);
}
}
);
} }
else { else {
setTimeout(() => { setTimeout(() => {

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -533,6 +533,7 @@
"textByColumns": "By columns", "textByColumns": "By columns",
"textByRows": "By rows", "textByRows": "By rows",
"textCancel": "Cancel", "textCancel": "Cancel",
"textOk": "Ok",
"textCentimeter": "Centimeter", "textCentimeter": "Centimeter",
"textCollaboration": "Collaboration", "textCollaboration": "Collaboration",
"textColorSchemes": "Color Schemes", "textColorSchemes": "Color Schemes",

3
apps/spreadsheeteditor/mobile/locale/ru.json
View file

@ -253,7 +253,7 @@
"saveTitleText": "Сохранение документа", "saveTitleText": "Сохранение документа",
"textLoadingDocument": "Загрузка документа", "textLoadingDocument": "Загрузка документа",
"textNo": "Нет", "textNo": "Нет",
"textOk": "Ok", "textOk": "Ок",
"textYes": "Да", "textYes": "Да",
"txtEditingMode": "Установка режима редактирования...", "txtEditingMode": "Установка режима редактирования...",
"uploadImageTextText": "Загрузка рисунка...", "uploadImageTextText": "Загрузка рисунка...",
@ -532,6 +532,7 @@
"textByColumns": "По столбцам", "textByColumns": "По столбцам",
"textByRows": "По строкам", "textByRows": "По строкам",
"textCancel": "Отмена", "textCancel": "Отмена",
"textOk": "Ок",
"textCentimeter": "Сантиметр", "textCentimeter": "Сантиметр",
"textCollaboration": "Совместная работа", "textCollaboration": "Совместная работа",
"textColorSchemes": "Цветовые схемы", "textColorSchemes": "Цветовые схемы",

22
apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx
View file

@ -17,13 +17,21 @@ class DownloadController extends Component {
if (format) { if (format) {
if (format == Asc.c_oAscFileType.CSV) { if (format == Asc.c_oAscFileType.CSV) {
f7.dialog.confirm( f7.dialog.create({
_t.warnDownloadAs, title: _t.notcriticalErrorTitle,
_t.notcriticalErrorTitle, text: _t.warnDownloadAs,
function () { buttons: [
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true); {
} text: _t.textCancel
) },
{
text: _t.textOk,
onClick: () => {
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true);
}
}
]
}).open();
} else { } else {
api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
} }