From 57c41e40e6e2174562469431681e893da3d7aa9f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 28 Jun 2018 13:16:35 +0300 Subject: [PATCH] Add Asc.c_oAscError.ID.DataEncrypted error --- 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 + 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 + 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 + 12 files changed, 42 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 57a7ff7d5..75b0f3564 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1393,6 +1393,10 @@ define([ console.warn(config.msg); 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; @@ -2254,7 +2258,8 @@ define([ warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', - warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.' + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), 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 93452bde4..72b451a92 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -452,6 +452,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE 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 ONLYOFFICE 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.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "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 d9aafc98a..afb8c46f2 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -873,6 +873,10 @@ define([ config.msg = this.errorBadImageUrl; break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1313,7 +1317,8 @@ define([ warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', - warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.' + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), 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 99349d58a..4802e6018 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -155,6 +155,7 @@ "DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE 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 ONLYOFFICE 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.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", "DE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index c8acda88f..9d96c1e06 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1135,6 +1135,10 @@ define([ console.warn(config.msg); 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; @@ -2033,7 +2037,8 @@ define([ warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', - warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.' + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index bb1ef7a38..94c5314f7 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -391,6 +391,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE 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 ONLYOFFICE 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.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "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 6452b65dc..735784fcb 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -824,6 +824,10 @@ define([ config.msg = this.errorBadImageUrl; break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1306,7 +1310,8 @@ define([ warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', - warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.' + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), 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 87819db98..6cad52be5 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -209,6 +209,7 @@ "PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE 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 ONLYOFFICE 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.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning", "PE.Controllers.Settings.txtLoading": "Loading...", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 24bbeabea..78970757c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1301,6 +1301,10 @@ define([ console.warn(config.msg); 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; @@ -2212,8 +2216,8 @@ define([ warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', - warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.' - + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 265e6ece6..c550d264c 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -500,6 +500,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE 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 ONLYOFFICE 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.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 5daeb9fb7..ffaa7e846 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -968,6 +968,10 @@ define([ config.msg = this.errorAccessDeny; break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1471,7 +1475,8 @@ define([ warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', - warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.' + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), 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 c6d681af7..14929d953 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -263,6 +263,7 @@ "SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE 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 ONLYOFFICE 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.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "SSE.Controllers.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",