From 98b26ee6f3ae3c39854b09859564500b908e8a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Wed, 1 May 2024 18:39:59 +0200 Subject: [PATCH] fix: translatable f-string --- canaille/core/endpoints/groups.py | 4 +++- canaille/translations/messages.pot | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/canaille/core/endpoints/groups.py b/canaille/core/endpoints/groups.py index d92e3f9d..3aeeb3a6 100644 --- a/canaille/core/endpoints/groups.py +++ b/canaille/core/endpoints/groups.py @@ -142,7 +142,9 @@ def delete_member(group): else: flash( _( - f"{form.member.data.formatted_name} has been removed from the group {group.display_name}" + "%(user_name)s has been removed from the group %(group_name)s", + user_name=form.member.data.formatted_name, + group_name=group.display_name, ), "success", ) diff --git a/canaille/translations/messages.pot b/canaille/translations/messages.pot index be3ac54f..59e34be8 100644 --- a/canaille/translations/messages.pot +++ b/canaille/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-04-28 19:05+0200\n" +"POT-Creation-Date: 2024-05-01 18:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -574,7 +574,12 @@ msgstr "" msgid "Group edition failed." msgstr "" -#: canaille/core/endpoints/groups.py:159 +#: canaille/core/endpoints/groups.py:144 +#, python-format +msgid "%(user_name)s has been removed from the group %(group_name)s" +msgstr "" + +#: canaille/core/endpoints/groups.py:161 #, python-format msgid "The group %(group)s has been sucessfully deleted" msgstr "" @@ -1330,6 +1335,7 @@ msgstr "" #: canaille/core/templates/modals/remove-group-member.html:25 #: canaille/core/templates/partial/group-members.html:64 +#: canaille/core/templates/partial/group-members.html:69 msgid "Remove" msgstr "" @@ -1342,7 +1348,11 @@ msgstr "" msgid "This account is locked" msgstr "" -#: canaille/core/templates/partial/group-members.html:79 +#: canaille/core/templates/partial/group-members.html:68 +msgid "Groups must have at least one member" +msgstr "" + +#: canaille/core/templates/partial/group-members.html:83 #: canaille/core/templates/partial/groups.html:31 #: canaille/core/templates/partial/users.html:73 #: canaille/oidc/templates/partial/authorization_list.html:31 @@ -1351,7 +1361,7 @@ msgstr "" msgid "No item matches your request" msgstr "" -#: canaille/core/templates/partial/group-members.html:81 +#: canaille/core/templates/partial/group-members.html:85 #: canaille/core/templates/partial/groups.html:33 #: canaille/core/templates/partial/users.html:75 #: canaille/oidc/templates/partial/authorization_list.html:33 @@ -1360,7 +1370,7 @@ msgstr "" msgid "Maybe try with different criterias?" msgstr "" -#: canaille/core/templates/partial/group-members.html:84 +#: canaille/core/templates/partial/group-members.html:88 #: canaille/core/templates/partial/groups.html:36 #: canaille/core/templates/partial/users.html:78 #: canaille/oidc/templates/partial/authorization_list.html:36