diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index dd44cf4b3..f01fb18ae 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -253,6 +253,10 @@ define([ config.closable = false; break; + case Asc.c_oAscError.ID.VKeyEncrypt: + config.msg = this.errorToken; + break; + case Asc.c_oAscError.ID.KeyExpire: config.msg = this.errorTokenExpire; break; @@ -261,6 +265,26 @@ define([ config.msg = this.errorViewerDisconnect; 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.UplImageUrl: + config.msg = this.errorBadImageUrl; + break; + + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -1708,7 +1732,13 @@ define([ mniImageFromFile: 'Image from File', mniImageFromUrl: 'Image from URL', mniImageFromStorage: 'Image from Storage', - txtUntitled: 'Untitled' + txtUntitled: 'Untitled', + errorToken: 'The document security token is not correctly formed.
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.', + errorBadImageUrl: 'Image url is incorrect', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.', }, DE.Controllers.ApplicationController)); diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json index 854673b63..74a2135ed 100644 --- a/apps/documenteditor/forms/locale/en.json +++ b/apps/documenteditor/forms/locale/en.json @@ -117,6 +117,12 @@ "DE.Controllers.ApplicationController.mniImageFromStorage": "Image from Storage", "DE.Controllers.ApplicationController.mniImageFromUrl": "Image from URL", "DE.Controllers.ApplicationController.txtUntitled": "Untitled", + "DE.Controllers.ApplicationController.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", + "DE.Controllers.ApplicationController.errorSessionAbsolute": "The document editing session has expired. Please reload the page.", + "DE.Controllers.ApplicationController.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.", + "DE.Controllers.ApplicationController.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.", + "DE.Controllers.ApplicationController.errorBadImageUrl": "Image URL is incorrect", + "DE.Controllers.ApplicationController.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "DE.Views.ApplicationView.textClear": "Clear All Fields", "DE.Views.ApplicationView.textCopy": "Copy", "DE.Views.ApplicationView.textCut": "Cut",