From 663cf2afc68a6872ab150f4d339b27d9a4757644 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 19:21:41 +0300 Subject: [PATCH 1/3] Fix Bug 50139 --- apps/common/main/resources/less/table-styler.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/common/main/resources/less/table-styler.less b/apps/common/main/resources/less/table-styler.less index 3399084bb..ad979147e 100644 --- a/apps/common/main/resources/less/table-styler.less +++ b/apps/common/main/resources/less/table-styler.less @@ -1,4 +1,6 @@ .table-styler { + background-color: @canvas-content-background; + table { &.transparent { background-color: @canvas-content-background !important; From ef801c5994704a82a900e25532dc784dc28a1551 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 20:12:12 +0300 Subject: [PATCH 2/3] [SSE] Add translations --- apps/spreadsheeteditor/main/app/controller/Main.js | 8 ++++++-- apps/spreadsheeteditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/ru.json | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index b1eacbf97..2bae4579a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -139,7 +139,9 @@ define([ 'Days': this.txtDays, 'Months': this.txtMonths, 'Quarters': this.txtQuarters, - 'Years': this.txtYears + 'Years': this.txtYears, + '%1 or %2': this.txtOr, + 'Qtr': this.txtQuarter }; styleNames.forEach(function(item){ @@ -2837,7 +2839,9 @@ define([ txtYears: 'Years', errorPivotGroup: 'Cannot group that selection.', errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.', - errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.' + errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.', + txtQuarter: 'Qtr', + txtOr: '%1 or %2' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 66b2f5931..b7ed732cf 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -704,6 +704,8 @@ "SSE.Controllers.Main.txtPreparedBy": "Prepared by", "SSE.Controllers.Main.txtPrintArea": "Print_Area", "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.txtRow": "Row", "SSE.Controllers.Main.txtRowLbls": "Row Labels", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 808c3243e..041f17eba 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -691,7 +691,9 @@ "SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки", "SSE.Controllers.Main.txtFile": "Файл", "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.txtLines": "Линии", "SSE.Controllers.Main.txtMath": "Математические знаки", From 15d30ed39ba884f51ecdd1a97cae2a4f9e6e7dc5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 20:45:25 +0300 Subject: [PATCH 3/3] Update translation --- apps/spreadsheeteditor/main/locale/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 041f17eba..70d747319 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -692,7 +692,7 @@ "SSE.Controllers.Main.txtFile": "Файл", "SSE.Controllers.Main.txtGrandTotal": "Общий итог", "SSE.Controllers.Main.txtGroup": "Группа", - "SSE.Controllers.Main.txtQuarter": "Квартал", + "SSE.Controllers.Main.txtQuarter": "Кв-л", "SSE.Controllers.Main.txtOr": "%1 или %2", "SSE.Controllers.Main.txtHours": "Часы", "SSE.Controllers.Main.txtLines": "Линии",