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

Merge pull request #996 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] For bug 51398
This commit is contained in:
Julia Radzhabova 2021-07-20 16:30:26 +03:00 committed by GitHub
parent e949655e8e a53b3dfdcb
commit 7dc4b22c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1692,6 +1692,14 @@ define([
config.msg = this.errorPivotWithoutUnderlying;
break;
case Asc.c_oAscError.ID.SingleColumnOrRowError:
config.msg = this.errorSingleColumnOrRowError;
break;
case Asc.c_oAscError.ID.LocationOrDataRangeError:
config.msg = this.errorLocationOrDataRangeError;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -2965,7 +2973,9 @@ define([
txtQuarter: 'Qtr',
txtOr: '%1 or %2',
errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.',
confirmReplaceFormulaInTable: 'Formulas in the header row will be removed and converted to static text.<br>Do you want to continue?'
confirmReplaceFormulaInTable: 'Formulas in the header row will be removed and converted to static text.<br>Do you want to continue?',
errorSingleColumnOrRowError: 'Location reference is not valid because the cells are not all in the same column or row.<br>Select cells that are all in a single column or row.',
errorLocationOrDataRangeError: 'The reference for the location or data range is not valid.'
}
})(), SSE.Controllers.Main || {}))
});

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

@ -685,6 +685,8 @@
"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.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.",
"SSE.Controllers.Main.errorSingleColumnOrRowError": "Location reference is not valid because the cells are not all in the same column or row.<br>Select cells that are all in a single column or row.",
"SSE.Controllers.Main.errorLocationOrDataRangeError": "The reference for the location or data range is not valid.",
"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.leavePageTextOnClose": "All unsaved changes in this spreadsheet will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
"SSE.Controllers.Main.loadFontsTextText": "Loading data...",
@ -1920,6 +1922,7 @@
"SSE.Views.DocumentHolder.txtUngroup": "Ungroup",
"SSE.Views.DocumentHolder.txtWidth": "Width",
"SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"SSE.Views.DocumentHolder.txtCondFormat": "Conditional Formatting",
"SSE.Views.FieldSettingsDialog.strLayout": "Layout",
"SSE.Views.FieldSettingsDialog.strSubtotals": "Subtotals",
"SSE.Views.FieldSettingsDialog.textReport": "Report Form",