From 16a2a5ff5e1a11c6c44df9f754951034ccfabe8e Mon Sep 17 00:00:00 2001 From: Lars van de Kerkhof Date: Wed, 23 Nov 2022 09:01:07 +0100 Subject: [PATCH 1/3] Specify translation context, so the value can be easily changed in a project if needed. --- src/oscar/apps/catalogue/abstract_models.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/oscar/apps/catalogue/abstract_models.py b/src/oscar/apps/catalogue/abstract_models.py index c283d48c58e..cc1382f6096 100644 --- a/src/oscar/apps/catalogue/abstract_models.py +++ b/src/oscar/apps/catalogue/abstract_models.py @@ -19,9 +19,8 @@ from django.utils.functional import cached_property from django.utils.html import strip_tags from django.utils.safestring import mark_safe -from django.utils.translation import get_language -from django.utils.translation import gettext_lazy as _ -from django.utils.translation import pgettext_lazy +from django.utils.translation import ( + get_language, pgettext_lazy, pgettext, gettext_lazy as _) from treebeard.mp_tree import MP_Node from oscar.core.loading import get_class, get_classes, get_model @@ -1145,8 +1144,8 @@ def _entity_as_text(self): @property def _boolean_as_text(self): if self.value: - return _("Yes") - return _("No") + return pgettext("Product attribute value", "Yes") + return pgettext("Product attribute value", "No") @property def value_as_html(self): From 615c6c85c6a39805ce82a9d422d775f08f6678bd Mon Sep 17 00:00:00 2001 From: Lars van de Kerkhof Date: Wed, 23 Nov 2022 09:06:12 +0100 Subject: [PATCH 2/3] tss --- tests/integration/catalogue/test_attributes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/catalogue/test_attributes.py b/tests/integration/catalogue/test_attributes.py index eb3c02d90fd..6855069e9d2 100644 --- a/tests/integration/catalogue/test_attributes.py +++ b/tests/integration/catalogue/test_attributes.py @@ -81,7 +81,6 @@ def test_boolean_value_as_text_false(self): assert attr_val.value_as_text == "No" - class TestMultiOptionAttributes(TestCase): def setUp(self): From 52482b8881fd5f6853f33a61e00c5709ea109ccc Mon Sep 17 00:00:00 2001 From: Lars van de Kerkhof Date: Wed, 23 Nov 2022 09:42:07 +0100 Subject: [PATCH 3/3] Fixes lint --- src/oscar/apps/catalogue/abstract_models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/oscar/apps/catalogue/abstract_models.py b/src/oscar/apps/catalogue/abstract_models.py index cc1382f6096..57a7862c0ec 100644 --- a/src/oscar/apps/catalogue/abstract_models.py +++ b/src/oscar/apps/catalogue/abstract_models.py @@ -19,8 +19,9 @@ from django.utils.functional import cached_property from django.utils.html import strip_tags from django.utils.safestring import mark_safe -from django.utils.translation import ( - get_language, pgettext_lazy, pgettext, gettext_lazy as _) +from django.utils.translation import get_language +from django.utils.translation import gettext_lazy as _ +from django.utils.translation import pgettext, pgettext_lazy from treebeard.mp_tree import MP_Node from oscar.core.loading import get_class, get_classes, get_model