Merge pull request #460 from ONLYOFFICE/fix/bug-46090

[SSE] Bug 46090
This commit is contained in:
Julia Radzhabova 2020-08-12 11:01:34 +03:00 committed by GitHub
commit 77aa10ce8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions

View file

@ -1475,6 +1475,10 @@ define([
config.msg = this.errorFrmlMaxTextLength; config.msg = this.errorFrmlMaxTextLength;
break; break;
case Asc.c_oAscError.ID.FrmlMaxReference:
config.msg = this.errorFrmlMaxReference;
break;
case Asc.c_oAscError.ID.DataValidate: case Asc.c_oAscError.ID.DataValidate:
var icon = errData ? errData.asc_getErrorStyle() : undefined; var icon = errData ? errData.asc_getErrorStyle() : undefined;
if (icon!==undefined) { if (icon!==undefined) {
@ -2619,7 +2623,8 @@ define([
textHasMacros: 'The file contains automatic macros.<br>Do you want to run macros?', textHasMacros: 'The file contains automatic macros.<br>Do you want to run macros?',
textRemember: 'Remember my choice', textRemember: 'Remember my choice',
errorPasteSlicerError: 'Table slicers cannot be copied from one workbook to another.<br>Try again by selecting the entire table and the slicers.', errorPasteSlicerError: 'Table slicers cannot be copied from one workbook to another.<br>Try again by selecting the entire table and the slicers.',
errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.<br>Please edit it and try again.' errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.<br>Please edit it and try again.',
errorFrmlMaxReference: 'You cannot enter this formula because it has too many values,<br>cell references, and/or names.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

View file

@ -501,6 +501,7 @@
"SSE.Controllers.Main.errorFormulaParsing": "Internal error while parsing the formula.", "SSE.Controllers.Main.errorFormulaParsing": "Internal error while parsing the formula.",
"SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&).", "SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&).",
"SSE.Controllers.Main.errorFrmlWrongReferences": "The function refers to a sheet that does not exist.<br>Please check the data and try again.", "SSE.Controllers.Main.errorFrmlWrongReferences": "The function refers to a sheet that does not exist.<br>Please check the data and try again.",
"SSE.Controllers.Main.errorFrmlMaxReference": "You cannot enter this formula because it has too many values,<br>cell references, and/or names.",
"SSE.Controllers.Main.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.", "SSE.Controllers.Main.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.",
"SSE.Controllers.Main.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.", "SSE.Controllers.Main.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.",
"SSE.Controllers.Main.errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.", "SSE.Controllers.Main.errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.",

View file

@ -1100,6 +1100,10 @@ define([
config.msg = this.errorFrmlMaxLength; config.msg = this.errorFrmlMaxLength;
break; break;
case Asc.c_oAscError.ID.FrmlMaxReference:
config.msg = this.errorFrmlMaxReference;
break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1736,7 +1740,8 @@ define([
textRemember: 'Remember my choice', textRemember: 'Remember my choice',
textYes: 'Yes', textYes: 'Yes',
textNo: 'No', textNo: 'No',
errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.<br>Please edit it and try again.' errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.<br>Please edit it and try again.',
errorFrmlMaxReference: 'You cannot enter this formula because it has too many values,<br>cell references, and/or names.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

View file

@ -173,6 +173,7 @@
"SSE.Controllers.Main.errorFormulaParsing": "Internal error while parsing the formula.", "SSE.Controllers.Main.errorFormulaParsing": "Internal error while parsing the formula.",
"SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&).", "SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.<br>Use the CONCATENATE function or concatenation operator (&).",
"SSE.Controllers.Main.errorFrmlWrongReferences": "The function refers to a sheet that does not exist.<br>Please check the data and try again.", "SSE.Controllers.Main.errorFrmlWrongReferences": "The function refers to a sheet that does not exist.<br>Please check the data and try again.",
"SSE.Controllers.Main.errorFrmlMaxReference": "You cannot enter this formula because it has too many values,<br>cell references, and/or names.",
"SSE.Controllers.Main.errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.", "SSE.Controllers.Main.errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.",
"SSE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "SSE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
"SSE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "SSE.Controllers.Main.errorKeyExpire": "Key descriptor expired",