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

Merge pull request #852 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-04-29 20:54:30 +03:00 committed by GitHub
parent 1244f69115 15d30ed39b
commit 02b6ec8a9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/table-styler.less
View file

@ -1,4 +1,6 @@
.table-styler { .table-styler {
background-color: @canvas-content-background;
table { table {
&.transparent { &.transparent {
background-color: @canvas-content-background !important; background-color: @canvas-content-background !important;

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

@ -139,7 +139,9 @@ define([
'Days': this.txtDays, 'Days': this.txtDays,
'Months': this.txtMonths, 'Months': this.txtMonths,
'Quarters': this.txtQuarters, 'Quarters': this.txtQuarters,
'Years': this.txtYears 'Years': this.txtYears,
'%1 or %2': this.txtOr,
'Qtr': this.txtQuarter
}; };
styleNames.forEach(function(item){ styleNames.forEach(function(item){
@ -2837,7 +2839,9 @@ define([
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.' errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.<br>Use the \'Refresh\' button to update the report.',
txtQuarter: 'Qtr',
txtOr: '%1 or %2'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

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

@ -704,6 +704,8 @@
"SSE.Controllers.Main.txtPreparedBy": "Prepared by", "SSE.Controllers.Main.txtPreparedBy": "Prepared by",
"SSE.Controllers.Main.txtPrintArea": "Print_Area", "SSE.Controllers.Main.txtPrintArea": "Print_Area",
"SSE.Controllers.Main.txtQuarters": "Quarters", "SSE.Controllers.Main.txtQuarters": "Quarters",
"SSE.Controllers.Main.txtQuarter": "Qtr",
"SSE.Controllers.Main.txtOr": "%1 or %2",
"SSE.Controllers.Main.txtRectangles": "Rectangles", "SSE.Controllers.Main.txtRectangles": "Rectangles",
"SSE.Controllers.Main.txtRow": "Row", "SSE.Controllers.Main.txtRow": "Row",
"SSE.Controllers.Main.txtRowLbls": "Row Labels", "SSE.Controllers.Main.txtRowLbls": "Row Labels",

4
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -691,7 +691,9 @@
"SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки", "SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки",
"SSE.Controllers.Main.txtFile": "Файл", "SSE.Controllers.Main.txtFile": "Файл",
"SSE.Controllers.Main.txtGrandTotal": "Общий итог", "SSE.Controllers.Main.txtGrandTotal": "Общий итог",
"SSE.Controllers.Main.txtGroup": "Сгруппировать", "SSE.Controllers.Main.txtGroup": "Группа",
"SSE.Controllers.Main.txtQuarter": "Кв-л",
"SSE.Controllers.Main.txtOr": "%1 или %2",
"SSE.Controllers.Main.txtHours": "Часы", "SSE.Controllers.Main.txtHours": "Часы",
"SSE.Controllers.Main.txtLines": "Линии", "SSE.Controllers.Main.txtLines": "Линии",
"SSE.Controllers.Main.txtMath": "Математические знаки", "SSE.Controllers.Main.txtMath": "Математические знаки",