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

Fix Bug 43454

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-01 17:43:24 +03:00
parent 04a9cd6c34
commit 5d0359456f
6 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1448,7 +1448,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.msg = this.errorConnectToServer;
config.closable = false;
break;
@ -2218,8 +2218,7 @@ define([
sendMergeTitle: 'Sending Merge',
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
txtErrorLoadHistory: 'Loading history failed',

4
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -948,7 +948,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.msg = this.errorConnectToServer;
break;
case Asc.c_oAscError.ID.UplImageUrl:
@ -1399,7 +1399,7 @@ define([
sendMergeTitle: 'Sending Merge',
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: '%1 open source version',

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1155,7 +1155,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.msg = this.errorConnectToServer;
config.closable = false;
break;
@ -1955,8 +1955,7 @@ define([
txtYAxis: 'Y Axis',
txtSeries: 'Seria',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
textBuyNow: 'Visit website',

5
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -867,7 +867,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.msg = this.errorConnectToServer;
break;
case Asc.c_oAscError.ID.UplImageUrl:
@ -1348,8 +1348,7 @@ define([
txtYAxis: 'Y Axis',
txtSeries: 'Seria',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: '%1 open source version',

5
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1310,7 +1310,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.msg = this.errorConnectToServer;
config.closable = false;
break;
@ -2184,8 +2184,7 @@ define([
errorInvalidRef: 'Enter a correct name for the selection or a valid reference to go to.',
errorCreateDefName: 'The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.',
errorPasteMaxRange: 'The copy and paste area does not match. Please select an area with the same size or click the first cell in a row to paste the copied cells.',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
errorLockedWorksheetRename: 'The sheet cannot be renamed at the moment as it is being renamed by another user',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',

5
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -980,7 +980,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.msg = this.errorConnectToServer;
break;
case Asc.c_oAscError.ID.LockedWorksheetRename:
@ -1523,8 +1523,7 @@ define([
sendMergeTitle: 'Sending Merge',
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
txtErrorLoadHistory: 'Loading history failed',