From f79a387c1c7923baba6d9429931f32be61d3442c Mon Sep 17 00:00:00 2001 From: Ryan Johnson Date: Mon, 6 Jan 2025 07:12:12 -0800 Subject: [PATCH] fix strings for extraction (#6421) --- kitsune/announcements/tasks.py | 6 ++++-- kitsune/sumo/form_fields.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kitsune/announcements/tasks.py b/kitsune/announcements/tasks.py index f04ea219900..4e2a62b0ee0 100644 --- a/kitsune/announcements/tasks.py +++ b/kitsune/announcements/tasks.py @@ -31,9 +31,11 @@ def send_group_email(announcement_id): @safe_translation def _make_mail(locale, user): if groups.count() == 1: - subject = _(f"New announcement for {groups[0].name}") + subject = _("New announcement for {name}").format(name=groups[0].name) else: - subject = _(f"New announcement for groups [{', '.join([g.name for g in groups])}]") + subject = _("New announcement for groups [{names}]").format( + names=", ".join(g.name for g in groups) + ) mail = make_mail( subject=subject, diff --git a/kitsune/sumo/form_fields.py b/kitsune/sumo/form_fields.py index 736be66f9d3..a71ee17791c 100644 --- a/kitsune/sumo/form_fields.py +++ b/kitsune/sumo/form_fields.py @@ -107,7 +107,7 @@ def to_python(self, value): for key, value in key_value_pairs: # check if the value is a valid username in the database if key.lower() == "user" and not User.objects.filter(username=value).exists(): - raise ValidationError(_(f"{value} is not a valid username.")) + raise ValidationError(_("{name} is not a valid username.").format(name=value)) to_objects.setdefault(f"{key.lower()}s", []).append(value) return to_objects