From 94d2c5660ad14fe4759e75c1009f0f6764caf6a6 Mon Sep 17 00:00:00 2001 From: imperosol Date: Tue, 25 Feb 2025 11:10:05 +0100 Subject: [PATCH] move hybrid translation to full front translation --- .../com/components/moderation-alert-index.ts | 11 ++++++++ com/templates/com/macros.jinja | 12 +-------- locale/fr/LC_MESSAGES/django.po | 26 +++++++++---------- locale/fr/LC_MESSAGES/djangojs.po | 21 +++++++++++---- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/com/static/bundled/com/components/moderation-alert-index.ts b/com/static/bundled/com/components/moderation-alert-index.ts index 02f3c564..9987670c 100644 --- a/com/static/bundled/com/components/moderation-alert-index.ts +++ b/com/static/bundled/com/components/moderation-alert-index.ts @@ -64,5 +64,16 @@ document.addEventListener("alpine:init", () => { }); return response.data.count; }, + + weeklyEventWarningMessage(nbEvents: number): string { + return interpolate( + gettext( + "This event will take place every week for %s weeks. " + + "If you moderate or delete this event, " + + "it will also be moderated (or deleted) for the following weeks.", + ), + [nbEvents], + ); + }, })); }); diff --git a/com/templates/com/macros.jinja b/com/templates/com/macros.jinja index d851b52f..5cda00b7 100644 --- a/com/templates/com/macros.jinja +++ b/com/templates/com/macros.jinja @@ -92,17 +92,7 @@

{% trans %}Weekly event{% endtrans %} - {# hybrid translation : the text is translated server-side, - but the interpolation of `nbEvents` is done client-side. #} -

+

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index bf44d1d5..d27dccd6 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-19 19:12+0100\n" +"POT-Creation-Date: 2025-02-25 11:04+0100\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Maréchal \n" @@ -1426,17 +1426,6 @@ msgstr "" "Elle sera cachée pour les autres utilisateurs tant qu'elle ne sera pas " "modérée." -#: com/templates/com/macros.jinja -#, python-format -msgid "" -"This event will take place every week for %%s weeks. If you moderate or " -"delete this event, it will also be moderated (or deleted) for the following " -"weeks." -msgstr "" -"Cet événement se déroulera chaque semaine pendant %%s semaines. Si vous " -"modérez ou supprimez cet événement, il sera également modéré (ou supprimé) " -"pour les semaines suivantes." - #: com/templates/com/macros.jinja com/templates/com/mailing_admin.jinja #: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja #: core/templates/core/file_detail.jinja @@ -1584,8 +1573,7 @@ msgstr "Voir plus" #: com/templates/com/news_list.jinja msgid "" -"It was too short. You already reached the end of the upcoming events " -"list." +"It was too short. You already reached the end of the upcoming events list." msgstr "" "C'était trop court. Vous êtes déjà arrivés à la fin de la liste des " "événements à venir." @@ -6043,3 +6031,13 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée." #, python-format msgid "Maximum characters: %(max_length)s" msgstr "Nombre de caractères max: %(max_length)s" + +#, python-format +#~ msgid "" +#~ "This event will take place every week for %%s weeks. If you moderate or " +#~ "delete this event, it will also be moderated (or deleted) for the " +#~ "following weeks." +#~ msgstr "" +#~ "Cet événement se déroulera chaque semaine pendant %%s semaines. Si vous " +#~ "modérez ou supprimez cet événement, il sera également modéré (ou " +#~ "supprimé) pour les semaines suivantes." diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po index 28177988..6d6a483d 100644 --- a/locale/fr/LC_MESSAGES/djangojs.po +++ b/locale/fr/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-08 12:23+0100\n" +"POT-Creation-Date: 2025-02-25 11:05+0100\n" "PO-Revision-Date: 2024-09-17 11:54+0200\n" "Last-Translator: Sli \n" "Language-Team: AE info \n" @@ -21,6 +21,17 @@ msgstr "" msgid "More info" msgstr "Plus d'informations" +#: com/static/bundled/com/components/moderation-alert-index.ts +#, javascript-format +msgid "" +"This event will take place every week for %s weeks. If you moderate or " +"delete this event, it will also be moderated (or deleted) for the following " +"weeks." +msgstr "" +"Cet événement se déroulera chaque semaine pendant %s semaines. Si vous " +"modérez ou supprimez cet événement, il sera également modéré (ou supprimé) " +"pour les semaines suivantes." + #: core/static/bundled/core/components/ajax-select-base.ts msgid "Remove" msgstr "Retirer" @@ -125,10 +136,6 @@ msgstr "Montrer plus" msgid "family_tree.%(extension)s" msgstr "arbre_genealogique.%(extension)s" -#: core/static/bundled/user/pictures-index.js -msgid "pictures.%(extension)s" -msgstr "photos.%(extension)s" - #: core/static/user/js/user_edit.js #, javascript-format msgid "captured.%s" @@ -187,6 +194,10 @@ msgstr "La réorganisation des types de produit a échoué avec le code : %d" msgid "Incorrect value" msgstr "Valeur incorrecte" +#: sas/static/bundled/sas/pictures-download-index.ts +msgid "pictures.%(extension)s" +msgstr "photos.%(extension)s" + #: sas/static/bundled/sas/viewer-index.ts msgid "Couldn't moderate picture" msgstr "Il n'a pas été possible de modérer l'image"