From f99f3d0e24948b41affeeaa63d52595dc94a7b0f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 7 Aug 2020 11:37:14 +0300 Subject: [PATCH] [SSE] Bug 25857 --- apps/spreadsheeteditor/main/app/controller/Main.js | 8 +++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/mobile/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/mobile/locale/en.json | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 50a858a16..a3ebb1274 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1515,6 +1515,11 @@ define([ config.maxwidth = 600; break; + case Asc.c_oAscError.ID.FrmlMaxLength: + config.msg = this.errorFrmlMaxLength; + config.maxwidth = 600; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2613,7 +2618,8 @@ define([ txtBlank: '(blank)', textHasMacros: 'The file contains automatic macros.
Do you want to run macros?', textRemember: 'Remember my choice', - errorPasteSlicerError: 'Table slicers cannot be copied from one workbook to another.
Try again by selecting the entire table and the slicers.' + errorPasteSlicerError: 'Table slicers cannot be copied from one workbook to another.
Try again by selecting the entire table and the slicers.', + errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.
Please edit it and try again.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index faecfc104..20e405775 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -536,6 +536,7 @@ "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "SSE.Controllers.Main.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.", + "SSE.Controllers.Main.errorFrmlMaxLength": "You cannot add this formula as its length exceeded the allowed number of characters.
Please edit it and try again.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 2a5310332..8d67a7be5 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1096,6 +1096,10 @@ define([ config.msg = this.errorUpdateVersionOnDisconnect; break; + case Asc.c_oAscError.ID.FrmlMaxLength: + config.msg = this.errorFrmlMaxLength; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1731,7 +1735,8 @@ define([ textHasMacros: 'The file contains automatic macros.
Do you want to run macros?', textRemember: 'Remember my choice', textYes: 'Yes', - textNo: 'No' + textNo: 'No', + errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.
Please edit it and try again.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 3b016815e..9ccc48fec 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -204,6 +204,7 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download it until the connection is restored and page is reloaded.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", + "SSE.Controllers.Main.errorFrmlMaxLength": "You cannot add this formula as its length exceeded the allowed number of characters.
Please edit it and try again.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data",