Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Fix Bug 44663

Browse source
This commit is contained in:
Julia Radzhabova 2020-03-13 17:09:06 +03:00
parent 20341f094e
commit 94633cce20
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/documenteditor/main/app/controller/Main.js
View file

@ -1550,6 +1550,10 @@ define([
config.msg = this.errorDirectUrl; config.msg = this.errorDirectUrl;
break; break;
case Asc.c_oAscError.ID.CannotCompareInCoEditing:
config.msg = this.errorCompare;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -2533,7 +2537,8 @@ define([
errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.',
txtChoose: 'Choose an item.', txtChoose: 'Choose an item.',
errorDirectUrl: 'Please verify the link to the document.<br>This link must be a direct link to the file for downloading.', errorDirectUrl: 'Please verify the link to the document.<br>This link must be a direct link to the file for downloading.',
txtStyle_Caption: 'Caption' txtStyle_Caption: 'Caption',
errorCompare: 'The Compare documents feature is not available in the co-editing mode.'
} }
})(), DE.Controllers.Main || {})) })(), DE.Controllers.Main || {}))
}); });

1
apps/documenteditor/main/locale/en.json
View file

@ -416,6 +416,7 @@
"DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "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.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,<br>but will not be able to download or print it until the connection is restored and page is reloaded.", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
"DE.Controllers.Main.errorCompare": "The Compare documents feature is not available in the co-editing mode.",
"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.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.loadFontsTextText": "Loading data...",
"DE.Controllers.Main.loadFontsTitleText": "Loading Data", "DE.Controllers.Main.loadFontsTitleText": "Loading Data",