diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index b7a44bdcd9..81b5e901ec 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1211,11 +1211,11 @@ define([ break; case Asc.c_oAscError.ID.VKeyEncrypt: - config.msg = this.errorKeyEncrypt; + config.msg = this.errorToken; break; case Asc.c_oAscError.ID.KeyExpire: - config.msg = this.errorKeyExpire; + config.msg = this.errorTokenExpire; break; case Asc.c_oAscError.ID.UserCountExceed: @@ -1263,6 +1263,22 @@ define([ config.msg = this.errorConnectToServer; break; + case Asc.c_oAscError.ID.SessionAbsolute: + config.msg = this.errorSessionAbsolute; + break; + + case Asc.c_oAscError.ID.SessionIdle: + config.msg = this.errorSessionIdle; + break; + + case Asc.c_oAscError.ID.SessionToken: + config.msg = this.errorSessionToken; + break; + + case Asc.c_oAscError.ID.AccessDeny: + config.msg = this.errorAccessDeny; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -2002,7 +2018,13 @@ define([ warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', titleLicenseExp: 'License expired', openErrorText: 'An error has occurred while opening the file', - saveErrorText: 'An error has occurred while saving the file' + saveErrorText: 'An error has occurred while saving the file', + errorToken: 'The document security token is not correctly formed.
Please contact your Document Server administrator.', + errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.', + errorSessionAbsolute: 'The document editing session has expired. Please reload the page.', + errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.', + errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.', + errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.' } })(), 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 bb358b0a0c..72563c3a0f 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -221,6 +221,12 @@ "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.", + "DE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", + "DE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", + "DE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.", + "DE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.", + "DE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.", + "DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.", "DE.Controllers.Main.loadFontsTextText": "Loading data...", "DE.Controllers.Main.loadFontsTitleText": "Loading Data", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 3b0902b508..761ad2615c 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -974,11 +974,11 @@ define([ break; case Asc.c_oAscError.ID.VKeyEncrypt: - config.msg = this.errorKeyEncrypt; + config.msg = this.errorToken; break; case Asc.c_oAscError.ID.KeyExpire: - config.msg = this.errorKeyExpire; + config.msg = this.errorTokenExpire; break; case Asc.c_oAscError.ID.UserCountExceed: @@ -1018,6 +1018,22 @@ define([ config.msg = this.errorConnectToServer; break; + case Asc.c_oAscError.ID.SessionAbsolute: + config.msg = this.errorSessionAbsolute; + break; + + case Asc.c_oAscError.ID.SessionIdle: + config.msg = this.errorSessionIdle; + break; + + case Asc.c_oAscError.ID.SessionToken: + config.msg = this.errorSessionToken; + break; + + case Asc.c_oAscError.ID.AccessDeny: + config.msg = this.errorAccessDeny; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1809,7 +1825,13 @@ define([ warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', titleLicenseExp: 'License expired', openErrorText: 'An error has occurred while opening the file', - saveErrorText: 'An error has occurred while saving the file' + saveErrorText: 'An error has occurred while saving the file', + errorToken: 'The document security token is not correctly formed.
Please contact your Document Server administrator.', + errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.', + errorSessionAbsolute: 'The document editing session has expired. Please reload the page.', + errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.', + errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.', + errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 75fb6d673e..550f76e571 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -135,6 +135,12 @@ "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.", + "PE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", + "PE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", + "PE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.", + "PE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.", + "PE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.", + "PE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", "PE.Controllers.Main.leavePageText": "You have unsaved changes in this presentation. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.", "PE.Controllers.Main.loadFontsTextText": "Loading data...", "PE.Controllers.Main.loadFontsTitleText": "Loading Data", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 90590058d4..3a341caca3 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1087,11 +1087,11 @@ define([ break; case Asc.c_oAscError.ID.VKeyEncrypt: - config.msg = this.errorKeyEncrypt; + config.msg = this.errorToken; break; case Asc.c_oAscError.ID.KeyExpire: - config.msg = this.errorKeyExpire; + config.msg = this.errorTokenExpire; break; case Asc.c_oAscError.ID.UserCountExceed: @@ -1183,6 +1183,22 @@ define([ config.msg = this.errorPrintMaxPagesCount; break; + case Asc.c_oAscError.ID.SessionAbsolute: + config.msg = this.errorSessionAbsolute; + break; + + case Asc.c_oAscError.ID.SessionIdle: + config.msg = this.errorSessionIdle; + break; + + case Asc.c_oAscError.ID.SessionToken: + config.msg = this.errorSessionToken; + break; + + case Asc.c_oAscError.ID.AccessDeny: + config.msg = this.errorAccessDeny; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -2019,7 +2035,13 @@ define([ openErrorText: 'An error has occurred while opening the file', saveErrorText: 'An error has occurred while saving the file', errorCopyMultiselectArea: 'This command cannot be used with multiple selections.
Select a single range and try again.', - errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.' + errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.', + errorToken: 'The document security token is not correctly formed.
Please contact your Document Server administrator.', + errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.', + errorSessionAbsolute: 'The document editing session has expired. Please reload the page.', + errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.', + errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.', + errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 057f61ba3d..863ccaaf9c 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -260,6 +260,12 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.", "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 or use the Esc button to cancel the formula editing.", + "SSE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", + "SSE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", + "SSE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.", + "SSE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.", + "SSE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.", + "SSE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", "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",