From 020d2af2cd08bae4494f47b42a23e904efe1cce9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 28 Aug 2019 17:29:39 +0300 Subject: [PATCH] Fix Bug 42593 --- apps/documenteditor/embed/js/ApplicationController.js | 11 ++++++++--- apps/documenteditor/embed/locale/en.json | 1 + apps/documenteditor/main/app/controller/Main.js | 7 ++++++- apps/documenteditor/main/locale/en.json | 1 + apps/documenteditor/mobile/app/controller/Main.js | 7 ++++++- apps/documenteditor/mobile/locale/en.json | 1 + .../embed/js/ApplicationController.js | 11 ++++++++--- apps/presentationeditor/embed/locale/en.json | 1 + apps/presentationeditor/main/app/controller/Main.js | 7 ++++++- apps/presentationeditor/main/locale/en.json | 1 + apps/presentationeditor/mobile/app/controller/Main.js | 7 ++++++- apps/presentationeditor/mobile/locale/en.json | 1 + .../embed/js/ApplicationController.js | 11 ++++++++--- apps/spreadsheeteditor/embed/locale/en.json | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/mobile/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/mobile/locale/en.json | 1 + 18 files changed, 69 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 07d2debb19..f8baf58913 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -398,6 +398,10 @@ DE.ApplicationController = new(function(){ message = me.errorUserDrop; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + message = me.errorFileSizeExceed; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -409,7 +413,7 @@ DE.ApplicationController = new(function(){ Common.Gateway.reportError(id, message); $('#id-critical-error-title').text(me.criticalErrorTitle); - $('#id-critical-error-message').text(message); + $('#id-critical-error-message').html(message); $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ window.location.reload(); }); @@ -418,7 +422,7 @@ DE.ApplicationController = new(function(){ Common.Gateway.reportWarning(id, message); $('#id-critical-error-title').text(me.notcriticalErrorTitle); - $('#id-critical-error-message').text(message); + $('#id-critical-error-message').html(message); $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ $('#id-critical-error-dialog').modal('hide'); }); @@ -553,6 +557,7 @@ DE.ApplicationController = new(function(){ downloadTextText: 'Downloading document...', waitText: 'Please, wait...', textLoadingDocument: 'Loading document', - txtClose: 'Close' + txtClose: 'Close', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index 77a8b48f85..91cd7c4b4c 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -12,6 +12,7 @@ "DE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", "DE.ApplicationController.errorDefaultMessage": "Error code: %1", "DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.", + "DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", "DE.ApplicationController.notcriticalErrorTitle": "Warning", "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 25986829a6..8ae8280137 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1486,6 +1486,10 @@ define([ config.msg = this.errorEmailClient; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2470,7 +2474,8 @@ define([ errorEmailClient: 'No email client could be found', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', txtHyperlink: 'Hyperlink', - waitText: 'Please, wait...' + waitText: 'Please, wait...', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index fe28eb861d..875b4acddd 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -665,6 +665,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 09a87a8979..deecc10f89 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -948,6 +948,10 @@ define([ config.msg = this.errorEditingDownloadas; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1432,7 +1436,8 @@ define([ errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download\' option to save the file backup copy to your computer hard drive.', textPaidFeature: 'Paid feature', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', - waitText: 'Please, wait...' + waitText: 'Please, wait...', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index a288509a91..96ecafa443 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -247,6 +247,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", "DE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index a425b38405..a140f01a60 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -498,6 +498,10 @@ PE.ApplicationController = new(function(){ message = me.errorUserDrop; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + message = me.errorFileSizeExceed; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -509,7 +513,7 @@ PE.ApplicationController = new(function(){ Common.Gateway.reportError(id, message); $('#id-critical-error-title').text(me.criticalErrorTitle); - $('#id-critical-error-message').text(message); + $('#id-critical-error-message').html(message); $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ window.location.reload(); }); @@ -518,7 +522,7 @@ PE.ApplicationController = new(function(){ Common.Gateway.reportWarning(id, message); $('#id-critical-error-title').text(me.notcriticalErrorTitle); - $('#id-critical-error-message').text(message); + $('#id-critical-error-message').html(message); $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ $('#id-critical-error-dialog').modal('hide'); }); @@ -624,6 +628,7 @@ PE.ApplicationController = new(function(){ downloadTextText: 'Downloading presentation...', waitText: 'Please, wait...', textLoadingDocument: 'Loading presentation', - txtClose: 'Close' + txtClose: 'Close', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(); diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json index c25ad71da4..a12071d1de 100644 --- a/apps/presentationeditor/embed/locale/en.json +++ b/apps/presentationeditor/embed/locale/en.json @@ -12,6 +12,7 @@ "PE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", "PE.ApplicationController.errorDefaultMessage": "Error code: %1", "PE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.", + "PE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "PE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", "PE.ApplicationController.notcriticalErrorTitle": "Warning", "PE.ApplicationController.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 cc4ef086d4..403b24c96d 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1193,6 +1193,10 @@ define([ config.msg = this.errorEmailClient; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2178,7 +2182,8 @@ define([ txtShape_polyline2: 'Freeform', errorEmailClient: 'No email client could be found', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', - waitText: 'Please, wait...' + waitText: 'Please, wait...', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index d3b768c0b6..686018f0f0 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -586,6 +586,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index cafc6e2661..da95d6730f 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -880,6 +880,10 @@ define([ config.msg = this.errorEditingDownloadas; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1387,7 +1391,8 @@ define([ errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download\' option to save the file backup copy to your computer hard drive.', textPaidFeature: 'Paid feature', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', - waitText: 'Please, wait...' + waitText: 'Please, wait...', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index d4d763049c..d55aa3c0a0 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -223,6 +223,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Search.textReplaceAll": "Replace All", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 9dafa9ae0a..1c80789456 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -406,6 +406,10 @@ SSE.ApplicationController = new(function(){ message = me.errorUserDrop; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + message = me.errorFileSizeExceed; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -417,7 +421,7 @@ SSE.ApplicationController = new(function(){ Common.Gateway.reportError(id, message); $('#id-critical-error-title').text(me.criticalErrorTitle); - $('#id-critical-error-message').text(message); + $('#id-critical-error-message').html(message); $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ window.location.reload(); }); @@ -426,7 +430,7 @@ SSE.ApplicationController = new(function(){ Common.Gateway.reportWarning(id, message); $('#id-critical-error-title').text(me.notcriticalErrorTitle); - $('#id-critical-error-message').text(message); + $('#id-critical-error-message').html(message); $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){ $('#id-critical-error-dialog').modal('hide'); }); @@ -571,6 +575,7 @@ SSE.ApplicationController = new(function(){ downloadTextText: 'Downloading spreadsheet...', waitText: 'Please, wait...', textLoadingDocument: 'Loading spreadsheet', - txtClose: 'Close' + txtClose: 'Close', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json index f94d807ac4..11ac34dc14 100644 --- a/apps/spreadsheeteditor/embed/locale/en.json +++ b/apps/spreadsheeteditor/embed/locale/en.json @@ -12,6 +12,7 @@ "SSE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", "SSE.ApplicationController.errorDefaultMessage": "Error code: %1", "SSE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.", + "SSE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "SSE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", "SSE.ApplicationController.notcriticalErrorTitle": "Warning", "SSE.ApplicationController.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 f382175bcd..93611d6d96 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1399,6 +1399,10 @@ define([ config.maxwidth = 600; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2432,7 +2436,8 @@ define([ txtDate: 'Date', txtTime: 'Time', txtTab: 'Tab', - txtFile: 'File' + txtFile: 'File', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 894f3aa369..ecec32f3ea 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -751,6 +751,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.txtCustom": "Custom", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index b187c935db..c120d514be 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1034,6 +1034,10 @@ define([ config.msg = this.errorFrmlMaxTextLength; break; + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1615,7 +1619,8 @@ define([ textPaidFeature: 'Paid feature', textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.
Use the CONCATENATE function or concatenation operator (&)', - waitText: 'Please, wait...' + waitText: 'Please, wait...', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' } })(), 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 34b803416c..138513d207 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -284,6 +284,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", "SSE.Controllers.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",