From 74b2a0c095498e2cacc5ad9addf70b80ea0a54de Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Tue, 14 Jan 2025 18:20:03 +0100 Subject: [PATCH] =?UTF-8?q?Restauration=20des=20mails=20du=20TFJM=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 21d4ac9d8d7689f9ae6898e7a1411176708c164f. --- .../mails/request_validation.html | 14 ++++----- .../mails/request_validation.txt | 12 ++++---- .../mails/team_not_validated.html | 16 +++++----- .../mails/team_not_validated.txt | 13 ++++----- .../participation/mails/team_validated.html | 29 ++++++++++--------- .../participation/mails/team_validated.txt | 26 +++++++++-------- .../mails/payment_confirmation.html | 8 +++-- .../mails/payment_confirmation.txt | 6 ++-- .../registration/mails/payment_reminder.html | 4 +-- .../registration/mails/payment_reminder.txt | 4 +-- 10 files changed, 70 insertions(+), 62 deletions(-) diff --git a/participation/templates/participation/mails/request_validation.html b/participation/templates/participation/mails/request_validation.html index 29b96d6..cbf75d1 100644 --- a/participation/templates/participation/mails/request_validation.html +++ b/participation/templates/participation/mails/request_validation.html @@ -2,28 +2,28 @@ - Validation request - ETEAM + Demande de validation - TFJM²

-Hi, +Bonjour,

-The team "{{ team.name }}" ({{ team.trigram }}) has just asked to validate his team to take part -in ETEAM. -You can decide whether or not to accept the team by going to the team page: +L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer +au {{ team.participation.get_problem_display }} du TFJM². +Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe : https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}

-Sincerely yours, +Cordialement,

-The ETEAM team +L'organisation du TFJM²

diff --git a/participation/templates/participation/mails/request_validation.txt b/participation/templates/participation/mails/request_validation.txt index fe84e37..d9ff5bf 100644 --- a/participation/templates/participation/mails/request_validation.txt +++ b/participation/templates/participation/mails/request_validation.txt @@ -1,10 +1,10 @@ -Hi {{ user }}, +Bonjour {{ user }}, -The team "{{ team.name }}" ({{ team.trigram }}) has just asked to validate his team to take part -in ETEAM. -You can decide whether or not to accept the team by going to the team page: +L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer +au {{ team.participation.get_problem_display }} du TFJM². +Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe : https://{{ domain }}{% url "participation:team_detail" pk=team.pk %} -Sincerely yours, +Cordialement, -The ETEAM team +L'organisation du TFJM² diff --git a/participation/templates/participation/mails/team_not_validated.html b/participation/templates/participation/mails/team_not_validated.html index 3697650..915a003 100644 --- a/participation/templates/participation/mails/team_not_validated.html +++ b/participation/templates/participation/mails/team_not_validated.html @@ -2,21 +2,21 @@ - Team not validated – ETEAM + Équipe non validée – TFJM² -Hi,
+Bonjour,

-Unfortunately, your team "{{ team.name }}" ({{ team.trigram }}) has not been validated. -Please check that your authorisations are correctly filled in. -The organisers are sending you this message:
+Maleureusement, votre équipe « {{ team.name }} » ({{ team.trigram }}) n'a pas été validée. Veuillez vérifier que vos autorisations +de droit à l'image sont correctes. Les organisateurs vous adressent ce message :

{{ message }}

-Please contact us at eteam_moc@proton.me if you need further information. +N'hésitez pas à nous contacter à l'adresse contact@tfjm.org +pour plus d'informations.
-Sincerely yours,
+Cordialement,

-The ETEAM team +Le comité d'organisation du TFJM² diff --git a/participation/templates/participation/mails/team_not_validated.txt b/participation/templates/participation/mails/team_not_validated.txt index 8ed8a4e..9479fba 100644 --- a/participation/templates/participation/mails/team_not_validated.txt +++ b/participation/templates/participation/mails/team_not_validated.txt @@ -1,13 +1,12 @@ -Hi, +Bonjour, -Unfortunately, your team "{{ team.name }}" ({{ team.trigram }}) has not been validated. -Please check that your authorisations are correctly filled in. -The organisers are sending you this message:
+Maleureusement, votre équipe « {{ team.name }} » ({{ team.trigram }}) n'a pas été validée. Veuillez vérifier que vos +autorisations de droit à l'image sont correctes. Les organisateurs vous adressent ce message : {{ message }} -Please contact us at eteam_moc@proton.me if you need further information. +N'hésitez pas à nous contacter à l'adresse contact@tfjm.org pour plus d'informations. -Sincerely yours, +Cordialement, -The ETEAM team +Le comité d'organisation du TFJM² diff --git a/participation/templates/participation/mails/team_validated.html b/participation/templates/participation/mails/team_validated.html index 025c64e..9281279 100644 --- a/participation/templates/participation/mails/team_validated.html +++ b/participation/templates/participation/mails/team_validated.html @@ -2,36 +2,37 @@ - Team validated – ETEAM + Équipe validée – TFJM²

- Hello {{ registration }}, + Bonjour {{ registration }},

- Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to - to work on your problems. You can then upload your solutions to the platform. + Félicitations ! Votre équipe « {{ team.name }} » ({{ team.trigram }}) est désormais validée ! Vous êtes désormais + apte à travailler sur vos problèmes. Vous pourrez ensuite envoyer vos solutions sur la plateforme.

{% if payment %}

- You must now pay your participation fee of € {{ payment.amount }}. - You can pay by credit card or bank transfer. You'll find information - on the payment page which you can find on - your account. - If you have a scholarship, registration is free, but you must submit a justification on the same page. + Vous devez désormais vous acquitter de vos frais de participation, de {{ payment.amount }} € par élève. + Vous pouvez payer par carte bancaire ou par virement bancaire. Vous trouverez les informations + sur la page de paiement. + Si vous disposez d'une bourse, l'inscription est gratuite, mais vous devez soumettre un justificatif + sur la même page.

{% elif registration.is_coach and team.participation.tournament.price %}

- Your team must now pay a participation fee of {{ team.participation.tournament.price }} € per student (supervisors are exempt). Students with scholarships are exempt⋅es from these fees. - You can track the status of payments on - your team page. + Votre équipe doit désormais s'acquitter des frais de participation de {{ team.participation.tournament.price }} € + par élève (les encadrant⋅es sont exonéré⋅es). Les élèves qui disposent d'une bourse sont exonéré⋅es de ces frais. + Vous pouvez suivre l'état des paiements sur + la page de votre équipe.

{% endif %} {% if message %}

- The organisers send you this message: + Les organisateur⋅ices vous adressent ce message :

{{ message }} @@ -39,7 +40,7 @@ {% endif %}

- The ETEAM team + Le comité d'organisation du TFJM²

diff --git a/participation/templates/participation/mails/team_validated.txt b/participation/templates/participation/mails/team_validated.txt index 98b1814..20888c0 100644 --- a/participation/templates/participation/mails/team_validated.txt +++ b/participation/templates/participation/mails/team_validated.txt @@ -1,21 +1,23 @@ -Hello {{registration }}, +Bonjour {{ registration }}, -Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to -to work on your problems. You can then upload your solutions to the platform. -{% if payment %} -You must now pay your participation fee of € {{ payment.amount }}. -You can pay by credit card or bank transfer. You'll find information -on the payment page which you can find on your account: +Félicitations ! Votre équipe « {{ team.name }} » ({{ team.trigram }}) est désormais validée ! Vous êtes désormais apte +à travailler sur vos problèmes. Vous pourrez ensuite envoyer vos solutions sur la plateforme. +{% if team.participation.amount %} +Vous devez désormais vous acquitter de vos frais de participation, de {{ team.participation.amount }} €. +Vous pouvez payer par carte bancaire ou par virement bancaire. Vous trouverez les informations +sur la page de paiement que vous pouvez retrouver sur votre compte : https://{{ domain }}{% url 'registration:my_account_detail' %} -If you have a scholarship, registration is free, but you must submit a justification on the same page. +Si vous disposez d'une bourse, l'inscription est gratuite, mais vous devez soumettre un justificatif +sur la même page. {% elif registration.is_coach and team.participation.tournament.price %} -Your team must now pay a participation fee of {{ team.participation.tournament.price }} € per student (supervisors are exempt). Students with scholarships are exempt⋅es from these fees. -You can track the status of payments on your team page: +Votre équipe doit désormais s'acquitter des frais de participation de {{ team.participation.tournament.price }} € +par élève (les encadrant⋅es sont exonéré⋅es). Les élèves qui disposent d'une bourse sont exonéré⋅es de ces frais. +Vous pouvez suivre l'état des paiements sur la page de votre équipe : https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %} {% endif %} {% if message %} -The organisers send you this message: +Les organisateurices vous adressent ce message : {{ message }} {% endif %} -The ETEAM team +Le comité d'organisation du TFJM² diff --git a/registration/templates/registration/mails/payment_confirmation.html b/registration/templates/registration/mails/payment_confirmation.html index 4b6c6f3..279ac6b 100644 --- a/registration/templates/registration/mails/payment_confirmation.html +++ b/registration/templates/registration/mails/payment_confirmation.html @@ -14,7 +14,7 @@

{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %} - We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }}! + We successfully received the payment of {{ amount }} € for your participation for the TFJM² in the team {{ team }} for the tournament {{ tournament }}! {% endblocktrans %}

@@ -32,13 +32,17 @@

+

+ {% trans "Please note that these dates may be subject to change. If your local organizers gave you different dates, trust them." %} +

+

{% trans "NB: This mail don't represent a payment receipt. The payer should receive a mail from Hello Asso. If it is not the case, please contact us if necessary" %}

--

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

diff --git a/registration/templates/registration/mails/payment_confirmation.txt b/registration/templates/registration/mails/payment_confirmation.txt index baa9b2e..298aebb 100644 --- a/registration/templates/registration/mails/payment_confirmation.txt +++ b/registration/templates/registration/mails/payment_confirmation.txt @@ -2,7 +2,7 @@ {% trans "Hi" %} {{ registration|safe }}, {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %} -We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }}! +We successfully received the payment of {{ amount }} € for your participation for the TFJM² in the team {{ team }} for the tournament {{ tournament }}! {% endblocktrans %} {% trans "Your registration is now fully completed, and you can work on your solutions." %} @@ -13,8 +13,10 @@ We successfully received the payment of {{ amount }} € for your participation * {% trans "Problems draw:" %} {{ payment.tournament.solutions_draw|date }} * {% trans "Tournament dates:" %} {% trans "From" %} {{ payment.tournament.date_start|date }} {% trans "to" %} {{ payment.tournament.date_end|date }} +{% trans "Please note that these dates may be subject to change. If your local organizers gave you different dates, trust them." %} + {% trans "NB: This mail don't represent a payment receipt. The payer should receive a mail from Hello Asso. If it is not the case, please contact us if necessary" %} -- -{% trans "The ETEAM team" %} +{% trans "The TFJM² team" %} diff --git a/registration/templates/registration/mails/payment_reminder.html b/registration/templates/registration/mails/payment_reminder.html index 18d81ea..7de8452 100644 --- a/registration/templates/registration/mails/payment_reminder.html +++ b/registration/templates/registration/mails/payment_reminder.html @@ -14,7 +14,7 @@

{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %} - You are registered for the ETEAM. Your team {{ team }} has been successfully validated. + You are registered for the TFJM² of {{ tournament }}. Your team {{ team }} has been successfully validated. To end your inscription, you must pay the amount of {{ amount }} €. {% endblocktrans %}

@@ -49,7 +49,7 @@ --

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

diff --git a/registration/templates/registration/mails/payment_reminder.txt b/registration/templates/registration/mails/payment_reminder.txt index 1062a9a..18e2be7 100644 --- a/registration/templates/registration/mails/payment_reminder.txt +++ b/registration/templates/registration/mails/payment_reminder.txt @@ -2,7 +2,7 @@ {% trans "Hi" %} {{ registration|safe }}, {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %} -You are registered for the ETEAM. Your team {{ team }} has been successfully validated. +You are registered for the TFJM² of {{ tournament }}. Your team {{ team }} has been successfully validated. To end your inscription, you must pay the amount of {{ amount }} €. {% endblocktrans %} {% if payment.grouped %} @@ -19,4 +19,4 @@ https://{{ domain }}{% url "registration:update_payment" pk=payment.pk %} {% trans "If you have any problem, feel free to contact us." %} -- -The ETEAM team +The TFJM² team