From df31968a778ad19bae00de72d681989fbf8c62c9 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Wed, 15 Jan 2025 13:29:17 +0100 Subject: [PATCH 1/4] Revert "Update 2 files" This reverts commit 7c83ae8730eda795f2b15bd70402e96adb215528. --- .../registration/mails/add_organizer.html | 19 ++++++++++--------- .../registration/mails/add_organizer.txt | 17 ++++++++++------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/registration/templates/registration/mails/add_organizer.html b/registration/templates/registration/mails/add_organizer.html index 21ae6fc..121560b 100644 --- a/registration/templates/registration/mails/add_organizer.html +++ b/registration/templates/registration/mails/add_organizer.html @@ -9,29 +9,30 @@

- Hi {{ user.registration }}, + Bonjour {{ user.registration }},

- You have been invited by {{ inviter.registration }} to join the ETEAM platform, available at - https://{{ domain }}/. You have a volunteer account. + Vous avez été invités par {{ inviter.registration }} à rejoindre la plateforme du TFJM², accessible à l'adresse + https://{{ domain }}/. Vous disposez d'un compte de bénévole.

- A random password has been set: {{ password }}. - For security reasons, please change it as soon as you log in the first time. + Un mot de passe aléatoire a été défini : {{ password }}. + Par sécurité, merci de le changer dès votre connexion.

- In the event of a problem, please contact us by e-mail at the following address - eteam_moc@proton.me. + En cas de problème, merci de nous contacter soit par mail à l'adresse + contact@tfjm.org, soit sur la plateforme de chat accessible sur + https://element.tfjm.org/ en vous connectant avec les mêmes identifiants.

- Sincerely yours, + Bien cordialement,

--

- {% trans "The ETEAM team." %}
+ {% trans "The TFJM² team." %}

diff --git a/registration/templates/registration/mails/add_organizer.txt b/registration/templates/registration/mails/add_organizer.txt index 224f362..817545e 100644 --- a/registration/templates/registration/mails/add_organizer.txt +++ b/registration/templates/registration/mails/add_organizer.txt @@ -1,14 +1,17 @@ {% load i18n %} -Hi {{ user.registration }}, +Bonjour {{ user.registration }}, -You have been invited by {{ inviter.registration }} to join the ETEAM platform, available at https://{{ domain }}. You have a volunteer account. -A random password has been set: {{ password }}. -For security reasons, please change it as soon as you log in the first time. +Vous avez été invités par {{ inviter.registration }} à rejoindre la plateforme du TFJM², accessible à l'adresse +https://{{ domain }}/. Vous disposez d'un compte de bénévole. -In the event of a problem, please contact us by e-mail at the following address eteam_moc@proton.me. +Un mot de passe aléatoire a été défini : {{ password }}. +Par sécurité, merci de le changer dès votre connexion. -Sincerely yours, +En cas de problème, merci de nous contacter soit par mail à l'adresse contact@tfjm.org, soit sur la plateforme +de chat accessible sur https://element.tfjm.org/ en vous connectant avec les mêmes identifiants. + +Bien cordialement, -- -{% trans "The ETEAM team." %} +{% trans "The TFJM² team." %} From 882570800c5c946a8da5f14321d626e7e4541634 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Wed, 15 Jan 2025 13:30:06 +0100 Subject: [PATCH 2/4] Revert "Update 2 files" This reverts commit 1977ffdbc9ef8cc258635b6eaf4fde04b8040897. --- .../templates/registration/mails/email_validation_email.html | 4 ++-- .../templates/registration/mails/email_validation_email.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/registration/templates/registration/mails/email_validation_email.html b/registration/templates/registration/mails/email_validation_email.html index 03f04c6..9df42b3 100644 --- a/registration/templates/registration/mails/email_validation_email.html +++ b/registration/templates/registration/mails/email_validation_email.html @@ -13,7 +13,7 @@

- {% trans "You recently registered on the ETEAM platform. Please click on the link below to confirm your registration." %} + {% trans "You recently registered on the TFJM² platform. Please click on the link below to confirm your registration." %}

@@ -36,5 +36,5 @@ --

- {% trans "The ETEAM team." %}
+ {% trans "The TFJM² team." %}

diff --git a/registration/templates/registration/mails/email_validation_email.txt b/registration/templates/registration/mails/email_validation_email.txt index 2e5607c..8a3a31e 100644 --- a/registration/templates/registration/mails/email_validation_email.txt +++ b/registration/templates/registration/mails/email_validation_email.txt @@ -2,7 +2,7 @@ {% trans "Hi" %} {{ user.registration }}, -{% trans "You recently registered on the ETEAM platform. Please click on the link below to confirm your registration." %} +{% trans "You recently registered on the TFJM² platform. Please click on the link below to confirm your registration." %} https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} @@ -12,4 +12,4 @@ https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=toke {% trans "Thanks" %}, -{% trans "The ETEAM team." %} +{% trans "The TFJM² team." %} From be2e25894856168639fe483971c7c8cc6dc93169 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Wed, 15 Jan 2025 13:31:05 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Correction=20ETEAM=20=3D>=20TFJM=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/fr/LC_MESSAGES/django.po | 25 ++++++++----------- .../registration/mails/add_organizer.html | 3 +-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 25d74ed..36bcfcc 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-14 19:29+0100\n" +"POT-Creation-Date: 2025-01-15 13:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -3537,11 +3537,13 @@ msgstr "" "compte." #: registration/templates/registration/mails/add_organizer.html:36 -#: registration/templates/registration/mails/add_organizer.txt:14 +#: registration/templates/registration/mails/add_organizer.txt:17 #: registration/templates/registration/mails/email_validation_email.html:39 #: registration/templates/registration/mails/email_validation_email.txt:15 -msgid "The ETEAM team." -msgstr "L'équipe de l'ETEAM" +#: registration/templates/registration/mails/payment_confirmation.html:45 +#: registration/templates/registration/mails/payment_reminder.html:52 +msgid "The TFJM² team." +msgstr "L'équipe du TFJM²" #: registration/templates/registration/mails/email_validation_email.html:12 #: registration/templates/registration/mails/email_validation_email.txt:3 @@ -3555,10 +3557,10 @@ msgstr "Bonjour" #: registration/templates/registration/mails/email_validation_email.html:16 #: registration/templates/registration/mails/email_validation_email.txt:5 msgid "" -"You recently registered on the ETEAM platform. Please click on the link " +"You recently registered on the TFJM² platform. Please click on the link " "below to confirm your registration." msgstr "" -"Vous vous êtes inscrit⋅e sur la plateforme de l'ETEAM. Merci de cliquer sur " +"Vous vous êtes inscrit⋅e sur la plateforme du TFJM². Merci de cliquer sur " "le lien ci-dessous pour confirmer votre inscription." #: registration/templates/registration/mails/email_validation_email.html:26 @@ -3645,11 +3647,6 @@ msgstr "" "a payé devrait recevoir un mail de Hello Asso. Si ce n'est pas le cas, merci " "de nous contacter si nécessaire." -#: registration/templates/registration/mails/payment_confirmation.html:45 -#: registration/templates/registration/mails/payment_reminder.html:52 -msgid "The TFJM² team." -msgstr "L'équipe du TFJM²" - #: registration/templates/registration/mails/payment_confirmation.txt:21 msgid "The TFJM² team" msgstr "L'équipe du TFJM²" @@ -4557,9 +4554,9 @@ msgid "" msgstr "" "L'inscription dans les tournois franciliens est désormais unifiée. Si vous " "résidez en Île-de-France ou proche, votre inscription sera mise en commun " -"avec chacun des tournois de la région, et les organisateur⋅rices s'occuperont " -"de la répartition des équipes. Les contraintes de date peuvent toutefois " -"être indiquées dans la lettre de motivation." +"avec chacun des tournois de la région, et les organisateur⋅rices " +"s'occuperont de la répartition des équipes. Les contraintes de date peuvent " +"toutefois être indiquées dans la lettre de motivation." #: tfjm/templates/index_tfjm.html:46 #, python-format diff --git a/registration/templates/registration/mails/add_organizer.html b/registration/templates/registration/mails/add_organizer.html index 121560b..01dba3a 100644 --- a/registration/templates/registration/mails/add_organizer.html +++ b/registration/templates/registration/mails/add_organizer.html @@ -24,8 +24,7 @@

En cas de problème, merci de nous contacter soit par mail à l'adresse - contact@tfjm.org, soit sur la plateforme de chat accessible sur - https://element.tfjm.org/ en vous connectant avec les mêmes identifiants. + contact@tfjm.org.

From 905b96fbcf98a53908d6092af00c08ed4a8c5bb5 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Wed, 15 Jan 2025 13:35:41 +0100 Subject: [PATCH 4/4] Translate GDPR warning --- locale/fr/LC_MESSAGES/django.po | 54 ++++++++++++++----- .../participation/tournament_detail.html | 10 ++-- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 36bcfcc..9bbc3ea 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-15 13:30+0100\n" +"POT-Creation-Date: 2025-01-15 13:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -1034,6 +1034,7 @@ msgid "The team is already validated or the validation is pending." msgstr "La validation de l'équipe est déjà faite ou en cours." #: participation/forms.py:85 +#: participation/templates/participation/tournament_detail.html:211 msgid "IMPORTANT" msgstr "IMPORTANT" @@ -2606,39 +2607,68 @@ msgstr "Dépublier les notes pour le troisième tour" msgid "Files available for download" msgstr "Fichiers disponibles au téléchargement" -#: participation/templates/participation/tournament_detail.html:236 +#: participation/templates/participation/tournament_detail.html:214 +msgid "" +"The files accessible below may contain personal information. In compliance " +"with European law and out of respect for the confidentiality of participants " +"data, you may only use this data for purposes strictly necessary to the " +"organization of the tournament." +msgstr "" +"Les fichiers accessibles ci-dessous peuvent contenir des informations " +"personnelles. Par conformité avec le droit européen et par respect de la " +"confidentialité des données des participant⋅es, vous ne devez utiliser ces " +"données que dans un cadre strictement nécessaire en lien avec l'organisation " +"du tournoi." + +#: participation/templates/participation/tournament_detail.html:222 +msgid "" +"Moreover, it is your responsibility to delete these files once you no longer " +"need them, especially at the end of the tournament." +msgstr "" +"De plus, il est de votre responsabilité de supprimer ces fichiers une fois " +"que vous n'en avez plus besoin, notamment à la fin du tournoi." + +#: participation/templates/participation/tournament_detail.html:230 +msgid "" +"I agree not to divulge participants data and to delete them at the end of " +"the tournament." +msgstr "" +"Je m'engage à ne pas divulguer les données des participant⋅es et à les " +"supprimer à l'issue du tournoi" + +#: participation/templates/participation/tournament_detail.html:240 msgid "Validated team participant data spreadsheet" msgstr "Tableur des données des équipes validées" -#: participation/templates/participation/tournament_detail.html:241 +#: participation/templates/participation/tournament_detail.html:245 msgid "All teams participant data spreadsheet" msgstr "Tableur des données de toutes les équipes" -#: participation/templates/participation/tournament_detail.html:246 +#: participation/templates/participation/tournament_detail.html:250 msgid "Archive of all authorisations sorted by team and person" msgstr "Archive de toutes les autorisations triées par équipe et personne" -#: participation/templates/participation/tournament_detail.html:251 +#: participation/templates/participation/tournament_detail.html:255 msgid "Archive of all submitted solutions sorted by team" msgstr "Archive de toutes les solutions envoyées triées par équipe" -#: participation/templates/participation/tournament_detail.html:256 +#: participation/templates/participation/tournament_detail.html:260 msgid "Archive of all sent solutions sorted by problem" msgstr "Archive de toutes les solutions envoyées triées par problème" -#: participation/templates/participation/tournament_detail.html:261 +#: participation/templates/participation/tournament_detail.html:265 msgid "Archive of all sent solutions sorted by pool" msgstr "Archive de toutes les solutions envoyées triées par poule" -#: participation/templates/participation/tournament_detail.html:266 +#: participation/templates/participation/tournament_detail.html:270 msgid "Archive of all summary notes sorted by pool and passage" msgstr "Archive de toutes les notes de synthèse triées par poule et passage" -#: participation/templates/participation/tournament_detail.html:272 +#: participation/templates/participation/tournament_detail.html:276 msgid "Note spreadsheet on Google Sheets" msgstr "Tableur de notes sur Google Sheets" -#: participation/templates/participation/tournament_detail.html:277 +#: participation/templates/participation/tournament_detail.html:281 msgid "Archive of all printable note sheets sorted by pool" msgstr "Archive de toutes les fiches de notes imprimables triées par poule" @@ -3560,8 +3590,8 @@ msgid "" "You recently registered on the TFJM² platform. Please click on the link " "below to confirm your registration." msgstr "" -"Vous vous êtes inscrit⋅e sur la plateforme du TFJM². Merci de cliquer sur " -"le lien ci-dessous pour confirmer votre inscription." +"Vous vous êtes inscrit⋅e sur la plateforme du TFJM². Merci de cliquer sur le " +"lien ci-dessous pour confirmer votre inscription." #: registration/templates/registration/mails/email_validation_email.html:26 #: registration/templates/registration/mails/email_validation_email.txt:9 diff --git a/participation/templates/participation/tournament_detail.html b/participation/templates/participation/tournament_detail.html index 683d855..baf387b 100644 --- a/participation/templates/participation/tournament_detail.html +++ b/participation/templates/participation/tournament_detail.html @@ -208,22 +208,26 @@

{% trans "Files available for download" %}

-

IMPORTANT

+

{% trans "IMPORTANT" %}

+ {% blocktrans trimmed %} The files accessible below may contain personal information. - In compliance with European law and out of respect for the confidentiality of participants' data, + In compliance with European law and out of respect for the confidentiality of participants data, you may only use this data for purposes strictly necessary to the organization of the tournament. + {% endblocktrans %}

+ {% blocktrans trimmed %} Moreover, it is your responsibility to delete these files once you no longer need them, especially at the end of the tournament. + {% endblocktrans %}