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

Merge pull request #794 from ONLYOFFICE/fix/bug-49500

Browse source 
[SSE] Fix Bug 49500
This commit is contained in:
Julia Radzhabova 2021-04-07 12:46:45 +03:00 committed by GitHub
parent 0ec5ce92b8 cfa07c5799
commit 6763f1010a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 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

@ -1627,6 +1627,10 @@ define([
config.msg = this.errorPasteMultiSelect; config.msg = this.errorPasteMultiSelect;
break; break;
case Asc.c_oAscError.ID.PivotWithoutUnderlyingData:
config.msg = this.errorPivotWithoutUnderlying;
break;
default: default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break; break;
@ -2842,7 +2846,8 @@ define([
txtQuarters: 'Quarters', txtQuarters: 'Quarters',
txtYears: 'Years', txtYears: 'Years',
errorPivotGroup: 'Cannot group that selection.', errorPivotGroup: 'Cannot group that selection.',
errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.<br>Select a single range and try again.' errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.<br>Select a single range and try again.',
errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.<br>Use the \'Refresh\' button to update the report.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

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

@ -922,6 +922,7 @@
"SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.<br>Select a single range and try again.", "SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.<br>Select a single range and try again.",
"SSE.Controllers.Main.errorPivotWithoutUnderlying": "The Pivot Table report was saved without the underlying data.<br>Use the 'Refresh' button to update the report.",
"SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstCol": "First column",
"SSE.Controllers.Print.textFirstRow": "First row", "SSE.Controllers.Print.textFirstRow": "First row",