Merge pull request 'fix mobile app translations loading' (#100) from …

…fix/mobile-translations into hotfix/v8.2.1 Bug 66234
ONLYOFFICE · Oct 25, 2024 · af1adbf · af1adbf
2 parents ff26b4c + ca3fdbf
commit af1adbf
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 33 deletions.
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
@@ -468,7 +468,8 @@
     "uploadDocSizeMessage": "Maximum document size limit exceeded.",
     "uploadImageExtMessage": "Unknown image format.",
     "uploadImageFileCountMessage": "No images uploaded.",
-    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+    "textOk": "OK"
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
@@ -170,7 +170,7 @@ class ContextMenu extends ContextMenuController {
                       <span class="right-text">${_t.textDoNotShowAgain}</span>
                       </div>`,
             buttons: [{
-                text: 'OK',
+                text: _t.textOk,
                 onClick: () => {
                     const dontShow = $$('input[name="checkbox-show"]').prop('checked');
                     if (dontShow) LocalStorage.setItem("de-hide-copy-cut-paste-warning", 1);
@@ -199,7 +199,7 @@ class ContextMenu extends ContextMenuController {
                     text: _t.menuCancel
                 },
                 {
-                    text: 'OK',
+                    text: _t.textOk,
                     bold: true,
                     onClick: function () {
                         const size = picker.value;

diff --git a/apps/documenteditor/mobile/src/controller/Error.jsx b/apps/documenteditor/mobile/src/controller/Error.jsx
@@ -296,7 +296,7 @@ const ErrorController = inject('storeAppOptions','storeDocumentInfo')(({storeApp
             text    : config.msg,
             buttons: [
                 {
-                    text: 'OK',
+                    text: _t.textOk,
                     onClick: config.callback
                 }
             ]

diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -671,7 +671,7 @@ class MainController extends Component {
                 f7.dialog.create({
                     title: _t.notcriticalErrorTitle,
                     text : _t.errorOpensource,
-                    buttons: [{text: 'OK'}]
+                    buttons: [{ text: _t.textOk }]
                 }).open();
             }
             Common.Notifications.trigger('toolbar:activatecontrols');
@@ -694,11 +694,11 @@ class MainController extends Component {
             f7.dialog.create({
                 title: _t.notcriticalErrorTitle,
                 text : _t.warnLicenseAnonymous,
-                buttons: [{text: 'OK'}]
+                buttons: [{ text: _t.textOk }]
             }).open();
         } else if (this._state.licenseType) {
             let license = this._state.licenseType;
-            let buttons = [{text: 'OK'}];
+            let buttons = [{ text: _t.textOk }];
             if ((appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 &&
                 (license === Asc.c_oLicenseResult.SuccessLimit ||
                     appOptions.permissionsLicense === Asc.c_oLicenseResult.SuccessLimit)

diff --git a/apps/documenteditor/mobile/src/controller/add/AddTable.jsx b/apps/documenteditor/mobile/src/controller/add/AddTable.jsx
@@ -45,7 +45,7 @@ class AddTableController extends Component {
                     text: _t.textCancel
                 },
                 {
-                    text: 'OK',
+                    text: _t.textOk,
                     bold: true,
                     onClick: function () {
                         const size = picker.value;

diff --git a/apps/documenteditor/mobile/src/controller/settings/Download.jsx b/apps/documenteditor/mobile/src/controller/settings/Download.jsx
@@ -106,7 +106,7 @@ const onAdvancedOptions = (type, _t, isDocReady, canRequestClose, isDRM) => {
     Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
 
     const buttons = [{
-        text: 'OK',
+        text: _t.textOk,
         bold: true,
         onClick: function () {
             const password = document.getElementById('modal-password').value;
@@ -121,7 +121,7 @@ const onAdvancedOptions = (type, _t, isDocReady, canRequestClose, isDRM) => {
         f7.dialog.create({
             text: _t.txtIncorrectPwd,
             buttons : [{
-                text: 'OK',
+                text: _t.textOk,
                 bold: true,
             }]
         }).open();

diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
@@ -179,7 +179,8 @@
       "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
       "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
       "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-      "warnProcessRightsChange": "You don't have permission to edit the file."
+      "warnProcessRightsChange": "You don't have permission to edit the file.",
+      "textOk": "Ok"
     }
   },
   "Error": {
@@ -230,7 +231,8 @@
     "unknownErrorText": "Unknown error.",
     "uploadImageExtMessage": "Unknown image format.",
     "uploadImageFileCountMessage": "No images uploaded.",
-    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+    "textOk": "OK"
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

diff --git a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx
@@ -131,7 +131,7 @@ class ContextMenu extends ContextMenuController {
                       <span class="right-text">${_t.textDoNotShowAgain}</span>
                       </div>`,
             buttons: [{
-                text: 'OK',
+                text: _t.textOk,
                 onClick: () => {
                     const dontShow = $$('input[name="checkbox-show"]').prop('checked');
                     if (dontShow) LocalStorage.setItem("pe-hide-copy-cut-paste-warning", 1);
@@ -159,7 +159,7 @@ class ContextMenu extends ContextMenuController {
                     text: _t.menuCancel
                 },
                 {
-                    text: 'OK',
+                    text: _t.textOk,
                     bold: true,
                     onClick: function () {
                         const size = picker.value;

diff --git a/apps/presentationeditor/mobile/src/controller/Error.jsx b/apps/presentationeditor/mobile/src/controller/Error.jsx
@@ -248,7 +248,7 @@ const ErrorController = inject('storeAppOptions','storePresentationInfo')(({stor
             text    : config.msg,
             buttons: [
                 {
-                    text: 'OK',
+                    text: _t.textOk,
                     onClick: config.callback
                 }
             ]

diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx
@@ -650,7 +650,7 @@ class MainController extends Component {
                 f7.dialog.create({
                     title: _t.notcriticalErrorTitle,
                     text : _t.errorOpensource,
-                    buttons: [{text: 'OK'}]
+                    buttons: [{ text: _t.textOk }]
                 }).open();
             }
             Common.Notifications.trigger('toolbar:activatecontrols');
@@ -673,11 +673,11 @@ class MainController extends Component {
             f7.dialog.create({
                 title: _t.notcriticalErrorTitle,
                 text : _t.warnLicenseAnonymous,
-                buttons: [{text: 'OK'}]
+                buttons: [{ text: _t.textOk }]
             }).open();
         } else if (this._state.licenseType) {
             let license = this._state.licenseType;
-            let buttons = [{text: 'OK'}];
+            let buttons = [{ text: _t.textOk }];
             if ((appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 &&
                 (license === Asc.c_oLicenseResult.SuccessLimit ||
                     appOptions.permissionsLicense === Asc.c_oLicenseResult.SuccessLimit)
@@ -790,7 +790,7 @@ class MainController extends Component {
             Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument, true);
 
             const buttons = [{
-                text: 'OK',
+                text: _t.textOk,
                 bold: true,
                 onClick: () => {
                     const password = document.getElementById('modal-password').value;
@@ -806,7 +806,7 @@ class MainController extends Component {
                 f7.dialog.create({
                     text: _t.txtIncorrectPwd,
                     buttons : [{
-                        text: 'OK',
+                        text: _t.textOk,
                         bold: true,
                     }]
                 }).open();

diff --git a/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx b/apps/presentationeditor/mobile/src/controller/add/AddOther.jsx
@@ -48,7 +48,7 @@ class AddOtherController extends Component {
                     text: _t.textCancel
                 },
                 {
-                    text: 'OK',
+                    text: _t.textOk,
                     bold: true,
                     onClick: function () {
                         const size = picker.value;

diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
@@ -87,7 +87,7 @@ class ContextMenu extends ContextMenuController {
                 title: t('ContextMenu.notcriticalErrorTitle'),
                 text: t('ContextMenu.errorInvalidLink'),
                 buttons:[
-                    {text: 'OK'}
+                    { text: t('ContextMenu.textOk') }
                 ] 
             }).open();
         }
@@ -166,7 +166,7 @@ class ContextMenu extends ContextMenuController {
                             text: t('ContextMenu.menuCancel')
                         },
                         {
-                            text: 'OK',
+                            text: t('ContextMenu.textOk'),
                             onClick: () => {
                                 api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
                             }
@@ -193,7 +193,7 @@ class ContextMenu extends ContextMenuController {
                       <span class="right-text">${_t.textDoNotShowAgain}</span>
                       </div>`,
             buttons: [{
-                text: 'OK',
+                text: _t.textOk,
                 onClick: () => {
                     const dontShow = $$('input[name="checkbox-show"]').prop('checked');
                     if (dontShow) LocalStorage.setItem("sse-hide-copy-cut-paste-warning", 1);

diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
@@ -851,7 +851,7 @@ class MainController extends Component {
                 f7.dialog.create({
                     title: _t.notcriticalErrorTitle,
                     text : _t.errorOpensource,
-                    buttons: [{text: 'OK'}]
+                    buttons: [{ text: _t.textOk }]
                 }).open();
             }
             Common.Notifications.trigger('toolbar:activatecontrols');
@@ -874,11 +874,11 @@ class MainController extends Component {
             f7.dialog.create({
                 title: _t.notcriticalErrorTitle,
                 text : _t.warnLicenseAnonymous,
-                buttons: [{text: 'OK'}]
+                buttons: [{ text: _t.textOk }]
             }).open();
         } else if (this._state.licenseType) {
             let license = this._state.licenseType;
-            let buttons = [{text: 'OK'}];
+            let buttons = [{ text: _t.textOk }];
             if ((appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 &&
                 (license === Asc.c_oLicenseResult.SuccessLimit ||
                     appOptions.permissionsLicense === Asc.c_oLicenseResult.SuccessLimit)

diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx
@@ -231,7 +231,7 @@ const Statusbar = inject('storeWorksheets', 'storeAppOptions', 'users')(observer
                     '<div class="item-content item-input" style="margin-top: 15px; position: relative; padding-bottom: 10px;"><div class="item-inner"><div class="item-input-wrap" style="min-height: initial; width: 100%;"><input type="text" style="width: 100%;" name="modal-sheet-name" value="' + current + '" maxlength="31" placeholder="' + _t.textSheetName + '" /></div></div></div>',
                 buttons: [
                     {
-                        text: 'OK',
+                        text: _t.textOk,
                         bold: true,
                         onClick: function () {
                             let s = $$('input[name="modal-sheet-name"]').val(),

diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx
@@ -65,7 +65,7 @@ const onAdvancedOptions = (type, _t, isDocReady, canRequestClose, isDRM) => {
     Common.Notifications.trigger('preloader:close');
     Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
     const buttons = [{
-        text: 'OK',
+        text: _t.textOk,
         bold: true,
         onClick: function () {
             const password = document.getElementById('modal-password').value;
@@ -80,7 +80,7 @@ const onAdvancedOptions = (type, _t, isDocReady, canRequestClose, isDRM) => {
         f7.dialog.create({
             text: _t.txtIncorrectPwd,
             buttons : [{
-                text: 'OK',
+                text: _t.textOk,
                 bold: true,
             }]
         }).open();

diff --git a/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx
@@ -23,9 +23,7 @@ const FilterOptions = inject('storeAppOptions')(observer(props => {
                 title: _t.textErrorTitle,
                 text: _t.textErrorMsg,
                 buttons: [
-                    {
-                        text: 'OK',
-                    }
+                    { text: _t.textOk }
                 ]
             }).open();
         }