From e20688f998f61ceefee7649f97e0c7225971c4bd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 10 Nov 2021 18:12:38 +0300 Subject: [PATCH] Refactoring --- apps/documenteditor/main/app/controller/Main.js | 7 ------- apps/documenteditor/main/locale/en.json | 4 ++-- .../presentationeditor/main/app/controller/Main.js | 7 ------- apps/presentationeditor/main/locale/en.json | 4 ++-- apps/spreadsheeteditor/main/app/controller/Main.js | 14 -------------- apps/spreadsheeteditor/main/locale/en.json | 8 ++++---- 6 files changed, 8 insertions(+), 36 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d0372b4f5..1fd169e84 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1005,11 +1005,6 @@ define([ text = this.applyChangesTextText; break; - case Asc.c_oAscAsyncAction['PrepareToSave']: - title = this.savePreparingText; - text = this.savePreparingTitle; - break; - case Asc.c_oAscAsyncAction['MailMergeLoadFile']: title = this.mailMergeLoadFileText; text = this.mailMergeLoadFileTitle; @@ -2694,8 +2689,6 @@ define([ printTextText: 'Printing document...', uploadImageTitleText: 'Uploading Image', uploadImageTextText: 'Uploading image...', - savePreparingText: 'Preparing to save', - savePreparingTitle: 'Preparing to save. Please wait...', uploadImageSizeMessage: 'Maximum image size limit exceeded.', uploadImageExtMessage: 'Unknown image format.', uploadImageFileCountMessage: 'No images uploaded.', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index c5f30be24..4de022141 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -577,8 +577,8 @@ "DE.Controllers.Main.requestEditFailedTitleText": "Access denied", "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "DE.Controllers.Main.saveErrorTextDesktop": "This file cannot be saved or created.
Possible reasons are:
1. The file is read-only.
2. The file is being edited by other users.
3. The disk is full or corrupted.", - "DE.Controllers.Main.savePreparingText": "Preparing to save", - "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", + "del_DE.Controllers.Main.savePreparingText": "Preparing to save", + "del_DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "DE.Controllers.Main.saveTextText": "Saving document...", "DE.Controllers.Main.saveTitleText": "Saving Document", "DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index f1a33e7b1..5eb01d701 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -690,11 +690,6 @@ define([ text = this.applyChangesTextText; break; - case Asc.c_oAscAsyncAction['PrepareToSave']: - title = this.savePreparingText; - text = this.savePreparingTitle; - break; - case Asc.c_oAscAsyncAction['Waiting']: title = this.waitText; text = this.waitText; @@ -2555,8 +2550,6 @@ define([ txtNeedSynchronize: 'You have an updates', applyChangesTitleText: 'Loading Data', applyChangesTextText: 'Loading data...', - savePreparingText: 'Preparing to save', - savePreparingTitle: 'Preparing to save. Please wait...', loadingDocumentTitleText: 'Loading presentation', loadingDocumentTextText: 'Loading presentation...', warnProcessRightsChange: 'You have been denied the right to edit the file.', diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 2bcb2b569..57af52049 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -446,8 +446,8 @@ "PE.Controllers.Main.requestEditFailedTitleText": "Access denied", "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "PE.Controllers.Main.saveErrorTextDesktop": "This file cannot be saved or created.
Possible reasons are:
1. The file is read-only.
2. The file is being edited by other users.
3. The disk is full or corrupted.", - "PE.Controllers.Main.savePreparingText": "Preparing to save", - "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", + "del_PE.Controllers.Main.savePreparingText": "Preparing to save", + "del_PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.saveTextText": "Saving presentation...", "PE.Controllers.Main.saveTitleText": "Saving Presentation", "PE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 27d17b1cf..9e7563441 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -754,21 +754,11 @@ define([ text = this.uploadImageTextText; break; - case Asc.c_oAscAsyncAction.Recalc: - title = this.titleRecalcFormulas; - text = this.textRecalcFormulas; - break; - case Asc.c_oAscAsyncAction.SlowOperation: title = this.textPleaseWait; text = this.textPleaseWait; break; - case Asc.c_oAscAsyncAction['PrepareToSave']: - title = this.savePreparingText; - text = this.savePreparingTitle; - break; - case Asc.c_oAscAsyncAction['Waiting']: title = this.waitText; text = this.waitText; @@ -3000,8 +2990,6 @@ define([ printTextText: 'Printing document...', uploadImageTitleText: 'Uploading Image', uploadImageTextText: 'Uploading image...', - savePreparingText: 'Preparing to save', - savePreparingTitle: 'Preparing to save. Please wait...', loadingDocumentTitleText: 'Loading spreadsheet', uploadImageSizeMessage: 'Maximium image size limit exceeded.', uploadImageExtMessage: 'Unknown image format.', @@ -3016,8 +3004,6 @@ define([ warnBrowserZoom: 'Your browser\'s current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.', warnBrowserIE9: 'The application has low capabilities on IE9. Use IE10 or higher', pastInMergeAreaError: 'Cannot change part of a merged cell', - titleRecalcFormulas: 'Calculating formulas...', - textRecalcFormulas: 'Calculating formulas...', textPleaseWait: 'It\'s working hard. Please wait...', errorWrongBracketsCount: 'Found an error in the formula entered.
Wrong cout of brackets.', errorWrongOperator: 'An error in the entered formula. Wrong operator is used.
Please correct the error or use the Esc button to cancel the formula editing.', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 7ba93e2b7..33d9dedd2 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -740,8 +740,8 @@ "SSE.Controllers.Main.requestEditFailedTitleText": "Access denied", "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.", "SSE.Controllers.Main.saveErrorTextDesktop": "This file cannot be saved or created.
Possible reasons are:
1. The file is read-only.
2. The file is being edited by other users.
3. The disk is full or corrupted.", - "SSE.Controllers.Main.savePreparingText": "Preparing to save", - "SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", + "del_SSE.Controllers.Main.savePreparingText": "Preparing to save", + "del_SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "SSE.Controllers.Main.saveTextText": "Saving spreadsheet...", "SSE.Controllers.Main.saveTitleText": "Saving Spreadsheet", "SSE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", @@ -766,7 +766,7 @@ "SSE.Controllers.Main.textNoLicenseTitle": "License limit reached", "SSE.Controllers.Main.textPaidFeature": "Paid feature", "SSE.Controllers.Main.textPleaseWait": "The operation might take more time than expected. Please wait...", - "SSE.Controllers.Main.textRecalcFormulas": "Calculating formulas...", + "del_SSE.Controllers.Main.textRecalcFormulas": "Calculating formulas...", "SSE.Controllers.Main.textRemember": "Remember my choice for all files", "SSE.Controllers.Main.textRenameError": "User name must not be empty.", "SSE.Controllers.Main.textRenameLabel": "Enter a name to be used for collaboration", @@ -776,7 +776,7 @@ "SSE.Controllers.Main.textTryUndoRedoWarn": "The Undo/Redo functions are disabled for the Fast co-editing mode.", "SSE.Controllers.Main.textYes": "Yes", "SSE.Controllers.Main.titleLicenseExp": "License expired", - "SSE.Controllers.Main.titleRecalcFormulas": "Calculating...", + "del_SSE.Controllers.Main.titleRecalcFormulas": "Calculating...", "SSE.Controllers.Main.titleServerVersion": "Editor updated", "SSE.Controllers.Main.txtAccent": "Accent", "SSE.Controllers.Main.txtAll": "(All)",