ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-01-24 06:21:17 +00:00
Code Issues Releases Wiki Activity

Restauration des mails du TFJM²

Browse Source 
This reverts commit 21d4ac9d8d7689f9ae6898e7a1411176708c164f.
This commit is contained in:
Emmy D'Anello 2025-01-14 18:20:03 +01:00
parent 67958335ab
commit 74b2a0c095
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
10 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
participation/templates/participation/mails/request_validation.html
View File

@ -2,28 +2,28 @@
<html lang="fr"> <html lang="fr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Validation request - ETEAM</title> <title>Demande de validation - TFJM²</title>
</head> </head>
<body> <body>
<p> <p>
Hi, Bonjour,
</p> </p>
<p> <p>
The team "{{ team.name }}" ({{ team.trigram }}) has just asked to validate his team to take part L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer
in ETEAM. au {{ team.participation.get_problem_display }} du TFJM².
You can decide whether or not to accept the team by going to the team page: Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe :
<a href="https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}"> <a href="https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}">
https://{{ domain }}{% url "participation:team_detail" pk=team.pk %} https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}
</a> </a>
</p> </p>
<p> <p>
Sincerely yours, Cordialement,
</p> </p>
<p> <p>
The ETEAM team L'organisation du TFJM²
</p> </p>
</body> </body>
</html> </html>

12
participation/templates/participation/mails/request_validation.txt
View File

@ -1,10 +1,10 @@
Hi {{ user }}, Bonjour {{ user }},
The team "{{ team.name }}" ({{ team.trigram }}) has just asked to validate his team to take part L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer
in ETEAM. au {{ team.participation.get_problem_display }} du TFJM².
You can decide whether or not to accept the team by going to the team page: 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 %} https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}
Sincerely yours, Cordialement,
The ETEAM team L'organisation du TFJM²

16
participation/templates/participation/mails/team_not_validated.html
View File

@ -2,21 +2,21 @@
<html lang="fr"> <html lang="fr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Team not validated – ETEAM</title> <title>Équipe non validée – TFJM²</title>
</head> </head>
<body> <body>
Hi,<br/> Bonjour,<br/>
<br /> <br />
Unfortunately, your team "{{ team.name }}" ({{ team.trigram }}) has not been validated. Maleureusement, votre équipe « {{ team.name }} » ({{ team.trigram }}) n'a pas été validée. Veuillez vérifier que vos autorisations
Please check that your authorisations are correctly filled in. de droit à l'image sont correctes. Les organisateurs vous adressent ce message :<br />
The organisers are sending you this message:<br />
<br /> <br />
{{ message }}<br /> {{ message }}<br />
<br /> <br />
Please contact us at <a href="mailto:eteam_moc@proton.me">eteam_moc@proton.me</a> if you need further information. N'hésitez pas à nous contacter à l'adresse <a href="mailto:contact@tfjm.org">contact@tfjm.org</a>
pour plus d'informations.
<br/> <br/>
Sincerely yours,<br/> Cordialement,<br/>
<br/> <br/>
The ETEAM team Le comité d'organisation du TFJM²
</body> </body>
</html> </html>

13
participation/templates/participation/mails/team_not_validated.txt
View File

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

29
participation/templates/participation/mails/team_validated.html
View File

@ -2,36 +2,37 @@
<html lang="fr"> <html lang="fr">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Team validated – ETEAM</title> <title>Équipe validée – TFJM²</title>
</head> </head>
<body> <body>
<p> <p>
Hello {{ registration }}, Bonjour {{ registration }},
</p> </p>
<p> <p>
Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to Félicitations ! Votre équipe « {{ team.name }} » ({{ team.trigram }}) est désormais validée ! Vous êtes désormais
to work on your problems. You can then upload your solutions to the platform. apte à travailler sur vos problèmes. Vous pourrez ensuite envoyer vos solutions sur la plateforme.
</p> </p>
{% if payment %} {% if payment %}
<p> <p>
You must now pay your participation fee of € {{ payment.amount }}. Vous devez désormais vous acquitter de vos frais de participation, de {{ payment.amount }} € par élève.
You can pay by credit card or bank transfer. You'll find information Vous pouvez payer par carte bancaire ou par virement bancaire. Vous trouverez les informations
on the payment page which you can find on sur <a href="https://{{ domain }}{% url 'registration:update_payment' pk=payment.pk %}">la page de paiement</a>.
<a href="https://{{ domain }}{% url 'registration:my_account_detail' %}">your account</a>. Si vous disposez d'une bourse, l'inscription est gratuite, mais vous devez soumettre un justificatif
If you have a scholarship, registration is free, but you must submit a justification on the same page. sur la même page.
</p> </p>
{% elif registration.is_coach and team.participation.tournament.price %} {% elif registration.is_coach and team.participation.tournament.price %}
<p> <p>
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. Votre équipe doit désormais s'acquitter des frais de participation de {{ team.participation.tournament.price }} €
You can track the status of payments on 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.
<a href="https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %}">your team page</a>. Vous pouvez suivre l'état des paiements sur
<a href="https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %}">la page de votre équipe</a>.
</p> </p>
{% endif %} {% endif %}
{% if message %} {% if message %}
<p> <p>
The organisers send you this message: Les organisateur⋅ices vous adressent ce message :
</p> </p>
<p> <p>
{{ message }} {{ message }}
@ -39,7 +40,7 @@
{% endif %} {% endif %}
<p> <p>
The ETEAM team Le comité d'organisation du TFJM²
</p> </p>
</body> </body>
</html> </html>

26
participation/templates/participation/mails/team_validated.txt
View File

@ -1,21 +1,23 @@
Hello {{registration }}, Bonjour {{ registration }},
Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to Félicitations ! Votre équipe « {{ team.name }} » ({{ team.trigram }}) est désormais validée ! Vous êtes désormais apte
to work on your problems. You can then upload your solutions to the platform. à travailler sur vos problèmes. Vous pourrez ensuite envoyer vos solutions sur la plateforme.
{% if payment %} {% if team.participation.amount %}
You must now pay your participation fee of € {{ payment.amount }}. Vous devez désormais vous acquitter de vos frais de participation, de {{ team.participation.amount }} €.
You can pay by credit card or bank transfer. You'll find information Vous pouvez payer par carte bancaire ou par virement bancaire. Vous trouverez les informations
on the payment page which you can find on your account: sur la page de paiement que vous pouvez retrouver sur votre compte :
https://{{ domain }}{% url 'registration:my_account_detail' %} 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 %} {% 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. Votre équipe doit désormais s'acquitter des frais de participation de {{ team.participation.tournament.price }} €
You can track the status of payments on your team page: 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 %} https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %}
{% endif %} {% endif %}
{% if message %} {% if message %}
The organisers send you this message: Les organisateurices vous adressent ce message :
{{ message }} {{ message }}
{% endif %} {% endif %}
The ETEAM team Le comité d'organisation du TFJM²

8
registration/templates/registration/mails/payment_confirmation.html
View File

@ -14,7 +14,7 @@
<p> <p>
{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %} {% 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 %} {% endblocktrans %}
</p> </p>
@ -32,13 +32,17 @@
</ul> </ul>
</p> </p>
<p>
{% trans "Please note that these dates may be subject to change. If your local organizers gave you different dates, trust them." %}
</p>
<p> <p>
{% 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 "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" %}
</p> </p>
-- --
<p> <p>
{% trans "The ETEAM team." %}<br> {% trans "The TFJM² team." %}<br>
</p> </p>
</body> </body>
</html> </html>

6
registration/templates/registration/mails/payment_confirmation.txt
View File

@ -2,7 +2,7 @@
{% trans "Hi" %} {{ registration|safe }}, {% trans "Hi" %} {{ registration|safe }},
{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %} {% 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 %} {% endblocktrans %}
{% trans "Your registration is now fully completed, and you can work on your solutions." %} {% 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 "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 "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 "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" %}

4
registration/templates/registration/mails/payment_reminder.html
View File

@ -14,7 +14,7 @@
<p> <p>
{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %} {% 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 }} €. To end your inscription, you must pay the amount of {{ amount }} €.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
@ -49,7 +49,7 @@
-- --
<p> <p>
{% trans "The ETEAM team." %}<br> {% trans "The TFJM² team." %}<br>
</p> </p>
</body> </body>
</html> </html>

4
registration/templates/registration/mails/payment_reminder.txt
View File

@ -2,7 +2,7 @@
{% trans "Hi" %} {{ registration|safe }}, {% trans "Hi" %} {{ registration|safe }},
{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %} {% 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 }} €. To end your inscription, you must pay the amount of {{ amount }} €.
{% endblocktrans %} {% endblocktrans %}
{% if payment.grouped %} {% 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." %} {% trans "If you have any problem, feel free to contact us." %}
-- --
The ETEAM team The TFJM² team