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

Fix Bug 42593

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-28 17:29:39 +03:00
parent c6d59d7176
commit 020d2af2cd
18 changed files with 69 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -398,6 +398,10 @@ DE.ApplicationController = new(function(){
message = me.errorUserDrop;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
message = me.errorFileSizeExceed;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -409,7 +413,7 @@ DE.ApplicationController = new(function(){
Common.Gateway.reportError(id, message);
$('#id-critical-error-title').text(me.criticalErrorTitle);
$('#id-critical-error-message').text(message);
$('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
window.location.reload();
});
@ -418,7 +422,7 @@ DE.ApplicationController = new(function(){
Common.Gateway.reportWarning(id, message);
$('#id-critical-error-title').text(me.notcriticalErrorTitle);
$('#id-critical-error-message').text(message);
$('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
$('#id-critical-error-dialog').modal('hide');
});
@ -553,6 +557,7 @@ DE.ApplicationController = new(function(){
downloadTextText: 'Downloading document...',
waitText: 'Please, wait...',
textLoadingDocument: 'Loading document',
txtClose: 'Close'
txtClose: 'Close',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})();

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

@ -12,6 +12,7 @@
"DE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"DE.ApplicationController.errorDefaultMessage": "Error code: %1",
"DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
"DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
"DE.ApplicationController.notcriticalErrorTitle": "Warning",
"DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",

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

@ -1486,6 +1486,10 @@ define([
config.msg = this.errorEmailClient;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
config.msg = this.errorFileSizeExceed;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2470,7 +2474,8 @@ define([
errorEmailClient: 'No email client could be found',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
txtHyperlink: 'Hyperlink',
waitText: 'Please, wait...'
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})(), DE.Controllers.Main || {}))
});

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

@ -665,6 +665,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"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",

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

@ -948,6 +948,10 @@ define([
config.msg = this.errorEditingDownloadas;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
config.msg = this.errorFileSizeExceed;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1432,7 +1436,8 @@ define([
errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.',
textPaidFeature: 'Paid feature',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
waitText: 'Please, wait...'
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})(), DE.Controllers.Main || {}))
});

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

@ -247,6 +247,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"DE.Controllers.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",

11
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -498,6 +498,10 @@ PE.ApplicationController = new(function(){
message = me.errorUserDrop;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
message = me.errorFileSizeExceed;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -509,7 +513,7 @@ PE.ApplicationController = new(function(){
Common.Gateway.reportError(id, message);
$('#id-critical-error-title').text(me.criticalErrorTitle);
$('#id-critical-error-message').text(message);
$('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
window.location.reload();
});
@ -518,7 +522,7 @@ PE.ApplicationController = new(function(){
Common.Gateway.reportWarning(id, message);
$('#id-critical-error-title').text(me.notcriticalErrorTitle);
$('#id-critical-error-message').text(message);
$('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
$('#id-critical-error-dialog').modal('hide');
});
@ -624,6 +628,7 @@ PE.ApplicationController = new(function(){
downloadTextText: 'Downloading presentation...',
waitText: 'Please, wait...',
textLoadingDocument: 'Loading presentation',
txtClose: 'Close'
txtClose: 'Close',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})();

1
apps/presentationeditor/embed/locale/en.json
View file

@ -12,6 +12,7 @@
"PE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"PE.ApplicationController.errorDefaultMessage": "Error code: %1",
"PE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
"PE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"PE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
"PE.ApplicationController.notcriticalErrorTitle": "Warning",
"PE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",

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

@ -1193,6 +1193,10 @@ define([
config.msg = this.errorEmailClient;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
config.msg = this.errorFileSizeExceed;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2178,7 +2182,8 @@ define([
txtShape_polyline2: 'Freeform',
errorEmailClient: 'No email client could be found',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
waitText: 'Please, wait...'
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})(), PE.Controllers.Main || {}))
});

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

@ -586,6 +586,7 @@
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
"PE.Controllers.Toolbar.textAccent": "Accents",

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

@ -880,6 +880,10 @@ define([
config.msg = this.errorEditingDownloadas;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
config.msg = this.errorFileSizeExceed;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1387,7 +1391,8 @@ define([
errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.',
textPaidFeature: 'Paid feature',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
waitText: 'Please, wait...'
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})(), PE.Controllers.Main || {}))
});

1
apps/presentationeditor/mobile/locale/en.json
View file

@ -223,6 +223,7 @@
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"PE.Controllers.Search.textNoTextFound": "Text not Found",
"PE.Controllers.Search.textReplaceAll": "Replace All",
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning",

11
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -406,6 +406,10 @@ SSE.ApplicationController = new(function(){
message = me.errorUserDrop;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
message = me.errorFileSizeExceed;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -417,7 +421,7 @@ SSE.ApplicationController = new(function(){
Common.Gateway.reportError(id, message);
$('#id-critical-error-title').text(me.criticalErrorTitle);
$('#id-critical-error-message').text(message);
$('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
window.location.reload();
});
@ -426,7 +430,7 @@ SSE.ApplicationController = new(function(){
Common.Gateway.reportWarning(id, message);
$('#id-critical-error-title').text(me.notcriticalErrorTitle);
$('#id-critical-error-message').text(message);
$('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
$('#id-critical-error-dialog').modal('hide');
});
@ -571,6 +575,7 @@ SSE.ApplicationController = new(function(){
downloadTextText: 'Downloading spreadsheet...',
waitText: 'Please, wait...',
textLoadingDocument: 'Loading spreadsheet',
txtClose: 'Close'
txtClose: 'Close',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})();

1
apps/spreadsheeteditor/embed/locale/en.json
View file

@ -12,6 +12,7 @@
"SSE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"SSE.ApplicationController.errorDefaultMessage": "Error code: %1",
"SSE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
"SSE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"SSE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
"SSE.ApplicationController.notcriticalErrorTitle": "Warning",
"SSE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",

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

@ -1399,6 +1399,10 @@ define([
config.maxwidth = 600;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
config.msg = this.errorFileSizeExceed;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2432,7 +2436,8 @@ define([
txtDate: 'Date',
txtTime: 'Time',
txtTab: 'Tab',
txtFile: 'File'
txtFile: 'File',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})(), SSE.Controllers.Main || {}))
});

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

@ -751,6 +751,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning",
"SSE.Controllers.Print.txtCustom": "Custom",

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

@ -1034,6 +1034,10 @@ define([
config.msg = this.errorFrmlMaxTextLength;
break;
case Asc.c_oAscError.ID.ConvertationOpenLimitError:
config.msg = this.errorFileSizeExceed;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1615,7 +1619,8 @@ define([
textPaidFeature: 'Paid feature',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&)',
waitText: 'Please, wait...'
waitText: 'Please, wait...',
errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
}
})(), SSE.Controllers.Main || {}))
});

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -284,6 +284,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
"SSE.Controllers.Search.textNoTextFound": "Text not found",
"SSE.Controllers.Search.textReplaceAll": "Replace All",
"SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",