sc/inc/strings.hrc | 4 +---
sc/qa/uitest/autofilter/colorfilter.py | 4 ++--
sc/uiconfig/scalc/ui/filtersubdropdown.ui | 2 +-
sc/uiconfig/scalc/ui/standardfilterdialog.ui | 8 ++++----
4 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 126067992d7a2b3edc5dd6ce5e896343da537589
Author: Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Thu Jul 14 19:05:34 2022 +0200
Commit: Gabor Kelemen <kelem...@ubuntu.com>
CommitDate: Fri Jul 15 10:29:38 2022 +0200
tdf#148248 Text Color -> Font Color in AutoFilter/Standard Filter
Consistently with other places such as Formatting toolbar
and Format Cells -> Font Effects tab page
Change-Id: I7ec5733f01182b25b5d823a43a3639b21ee874e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137087
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 5e9c82592e68..9f9dfb454502 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -38,10 +38,8 @@
#define SCSTR_FILTER_NOTEMPTY
NC_("SCSTR_FILTER_NOTEMPTY", "Not Empty")
#define SCSTR_FILTER_COLOR NC_("SCSTR_FILTER_COLOR",
"Filter by Color")
#define SCSTR_FILTER_CONDITION
NC_("SCSTR_FILTER_CONDITION", "Filter by Condition")
-#define SCSTR_FILTER_TEXT_COLOR
NC_("SCSTR_FILTER_TEXT_COLOR", "Text Color")
-#define SCSTR_FILTER_BACKGROUND_COLOR
NC_("SCSTR_FILTER_BACKGROUND_COLOR", "Background Color")
// This must match the translation of the same strings of
standardfilterdialog|cond
-#define SCSTR_FILTER_TEXT_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Text color")
+#define SCSTR_FILTER_TEXT_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Font color")
#define SCSTR_FILTER_BACKGROUND_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Background color")
#define SCSTR_FILTER_NO_FILL
NC_("SCSTR_FILTER_NO_FILL", "No Fill")
#define SCSTR_FILTER_AUTOMATIC_COLOR
NC_("SCSTR_FILTER_AUTOMATIC_COLOR", "Automatic")
diff --git a/sc/qa/uitest/autofilter/colorfilter.py
b/sc/qa/uitest/autofilter/colorfilter.py
index 58f39227ee3d..967b17e36d6a 100644
--- a/sc/qa/uitest/autofilter/colorfilter.py
+++ b/sc/qa/uitest/autofilter/colorfilter.py
@@ -36,9 +36,9 @@ class ColorFilterTest(UITestCase):
xCond1 = xDialog.getChild("cond1")
# tdf#143103: Without the fix in place, this test would have
failed with
- # AssertionError: 'Text color' != ''
+ # AssertionError: 'Font color' != ''
self.assertEqual("Text color",
get_state_as_dict(xField1)['DisplayText'])
- self.assertEqual("Text color",
get_state_as_dict(xCond1)['DisplayText'])
+ self.assertEqual("Font color",
get_state_as_dict(xCond1)['DisplayText'])
xColor1 = xDialog.getChild("color1")
diff --git a/sc/uiconfig/scalc/ui/filtersubdropdown.ui
b/sc/uiconfig/scalc/ui/filtersubdropdown.ui
index d2e3c4a01dd9..e76388f95124 100644
--- a/sc/uiconfig/scalc/ui/filtersubdropdown.ui
+++ b/sc/uiconfig/scalc/ui/filtersubdropdown.ui
@@ -202,7 +202,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn7">
- <property name="title" translatable="yes"
context="filtersubdropdown|textcolor">Text Color</property>
+ <property name="title" translatable="yes"
context="filtersubdropdown|textcolor">Font Color</property>
<child>
<object class="GtkCellRendererToggle"
id="cellrenderertoggle2"/>
<attributes>
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index 359273e11ff7..bfa9c1e668c7 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -430,7 +430,7 @@
<item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Font color</item>
<item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<accessibility>
@@ -469,7 +469,7 @@
<item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Font color</item>
<item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<accessibility>
@@ -508,7 +508,7 @@
<item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Font color</item>
<item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<accessibility>
@@ -547,7 +547,7 @@
<item translatable="yes"
context="standardfilterdialog|cond">Does not begin with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Ends with</item>
<item translatable="yes"
context="standardfilterdialog|cond">Does not end with</item>
- <item translatable="yes"
context="standardfilterdialog|cond">Text color</item>
+ <item translatable="yes"
context="standardfilterdialog|cond">Font color</item>
<item translatable="yes"
context="standardfilterdialog|cond">Background color</item>
</items>
<child internal-child="accessible">
