From 605c204bee19e8c50a980b3d74c16505ccd4766b Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Fri, 3 Sep 2021 16:37:48 +0300
Subject: [PATCH 1/2] [DE SSE mobile] Fix Bug 52338, Fix Bug 52336

---
 .../mobile/src/controller/settings/Download.jsx             | 6 +++---
 .../mobile/src/controller/settings/Download.jsx             | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/mobile/src/controller/settings/Download.jsx b/apps/documenteditor/mobile/src/controller/settings/Download.jsx
index 27c6678ee..88c2a7fb3 100644
--- a/apps/documenteditor/mobile/src/controller/settings/Download.jsx
+++ b/apps/documenteditor/mobile/src/controller/settings/Download.jsx
@@ -25,6 +25,7 @@ class DownloadController extends Component {
         const _t = t("Settings", { returnObjects: true });
 
         if(format) {
+            this.closeModal();
             if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) {
                 f7.dialog.create({
                     title: _t.notcriticalErrorTitle,
@@ -37,8 +38,8 @@ class DownloadController extends Component {
                             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);
+                                    const advOptions = api.asc_getAdvancedOptions();
+                                    Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.TXT, advOptions, 2, new Asc.asc_CDownloadOptions(format));
                                 }
                                 else {
                                     setTimeout(() => {
@@ -51,7 +52,6 @@ class DownloadController extends Component {
                 }).open();
             } 
             else {
-                this.closeModal();
                 setTimeout(() => {
                     api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
                 }, 400);
diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx
index 2d10d41f8..5bd3dbf81 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx
@@ -25,6 +25,7 @@ class DownloadController extends Component {
         const _t = t("View.Settings", {returnObjects: true});
 
         if (format) {
+            this.closeModal();
             if (format == Asc.c_oAscFileType.CSV) {
                 f7.dialog.create({
                     title: _t.notcriticalErrorTitle,
@@ -36,13 +37,14 @@ class DownloadController extends Component {
                         {
                             text: _t.textOk,
                             onClick: () => {
-                                onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true);
+                                const advOptions = api.asc_getAdvancedOptions();
+                                Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.CSV, advOptions, 2, new Asc.asc_CDownloadOptions(format))
+                                // onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true);
                             }
                         }
                     ]
                 }).open();
             } else {
-                this.closeModal();
                 api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
             }
         }

From 5887cb5077ac362ba375b018ea8c7a23a2189d70 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Fri, 3 Sep 2021 17:14:08 +0300
Subject: [PATCH 2/2] [DE PE mobile] Fix Bug 52348

---
 apps/documenteditor/mobile/src/view/edit/EditText.jsx     | 4 ++--
 apps/presentationeditor/mobile/src/view/edit/EditText.jsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index a00626bd1..b07f4eb7d 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -520,10 +520,10 @@ const EditText = props => {
             previewList = '';
             break;
         case 0: 
-            previewList = 'Bullets';
+            previewList = t('Edit.textBullets');
             break;
         case 1: 
-            previewList = 'Numbers';
+            previewList = t('Edit.textNumbers');
             break;
     }
 
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
index 45b503bd6..d6c4084d9 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
@@ -34,10 +34,10 @@ const EditText = props => {
             previewList = '';
             break;
         case 0: 
-            previewList = 'Bullets';
+            previewList = t('View.Edit.textBullets');
             break;
         case 1: 
-            previewList = 'Numbers';
+            previewList = t('View.Edit.textNumbers');
             break;
     }