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

[SSE] Bug 40635

Browse source
This commit is contained in:
Julia Radzhabova 2019-02-19 16:33:15 +03:00
parent e8bace41c2
commit e1f22d4d22
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1350,6 +1350,10 @@ define([
config.msg = this.errorChangeArray;
break;
case Asc.c_oAscError.ID.MultiCellsInTablesFormulaArray:
config.msg = this.errorMultiCellFormula;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2472,7 +2476,8 @@ define([
txtShape_spline: 'Curve',
txtShape_polyline1: 'Scribble',
txtShape_polyline2: 'Freeform',
errorChangeArray: 'You cannot change part of an array.'
errorChangeArray: 'You cannot change part of an array.',
errorMultiCellFormula: 'Multi-cell array formulas are not allowed in tables.'
}
})(), SSE.Controllers.Main || {}))
});

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

@ -449,6 +449,7 @@
"SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
"SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.<br>Wrong number of brackets is used.",
"SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.<br>Please correct the error.",
"SSE.Controllers.Main.errorMultiCellFormula": "Multi-cell array formulas are not allowed in tables.",
"SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.",
"SSE.Controllers.Main.loadFontsTextText": "Loading data...",
"SSE.Controllers.Main.loadFontsTitleText": "Loading Data",

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

@ -985,6 +985,10 @@ define([
config.msg = this.errorEditingDownloadas;
break;
case Asc.c_oAscError.ID.MultiCellsInTablesFormulaArray:
config.msg = this.errorMultiCellFormula;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -1545,7 +1549,8 @@ define([
closeButtonText: 'Close File',
scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
errorChangeArray: 'You cannot change part of an array.',
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.'
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.',
errorMultiCellFormula: 'Multi-cell array formulas are not allowed in tables.'
}
})(), SSE.Controllers.Main || {}))
});

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

@ -162,6 +162,7 @@
"SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.<br>Wrong number of brackets is used.",
"SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.<br>Please correct the error.",
"SSE.Controllers.Main.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.",
"SSE.Controllers.Main.errorMultiCellFormula": "Multi-cell array formulas are not allowed in tables.",
"SSE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"SSE.Controllers.Main.loadFontsTextText": "Loading data...",
"SSE.Controllers.Main.loadFontsTitleText": "Loading Data",