From 6a928ee35be099a4d26e4bae20fd931cc467b992 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Thu, 22 Feb 2024 18:43:18 +0100 Subject: [PATCH] Prepare mails for payment confirmations and reminders Signed-off-by: Emmy D'Anello --- locale/fr/LC_MESSAGES/django.po | 166 ++++++++++++++++-- .../mails/payment_confirmation.html | 48 +++++ .../mails/payment_confirmation.txt | 23 +++ .../registration/mails/payment_reminder.html | 55 ++++++ .../registration/mails/payment_reminder.txt | 25 +++ 5 files changed, 301 insertions(+), 16 deletions(-) create mode 100644 registration/templates/registration/mails/payment_confirmation.html create mode 100644 registration/templates/registration/mails/payment_confirmation.txt create mode 100644 registration/templates/registration/mails/payment_reminder.html create mode 100644 registration/templates/registration/mails/payment_reminder.txt diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 00e1222..4963f27 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: 2024-02-21 23:41+0100\n" +"POT-Creation-Date: 2024-02-22 18:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -1092,6 +1092,7 @@ msgstr "Rejoindre" #: participation/templates/participation/team_detail.html:215 #: participation/templates/participation/tournament_form.html:12 #: participation/templates/participation/update_team.html:12 +#: registration/templates/registration/payment_form.html:207 #: registration/templates/registration/update_user.html:16 #: registration/templates/registration/user_detail.html:186 msgid "Update" @@ -1547,10 +1548,14 @@ msgid "dates" msgstr "dates" #: participation/templates/participation/tournament_detail.html:28 +#: registration/templates/registration/mails/payment_confirmation.html:31 +#: registration/templates/registration/mails/payment_confirmation.txt:15 msgid "From" msgstr "Du" #: participation/templates/participation/tournament_detail.html:28 +#: registration/templates/registration/mails/payment_confirmation.html:31 +#: registration/templates/registration/mails/payment_confirmation.txt:15 msgid "to" msgstr "au" @@ -2294,11 +2299,17 @@ msgstr "" #: 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 +#: 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 +#: registration/templates/registration/mails/payment_confirmation.html:12 +#: registration/templates/registration/mails/payment_confirmation.txt:3 +#: registration/templates/registration/mails/payment_reminder.html:12 +#: registration/templates/registration/mails/payment_reminder.txt:3 msgid "Hi" msgstr "Bonjour" @@ -2330,6 +2341,137 @@ msgstr "Pour rappel, vous nom d'utilisateur⋅rice est votre adresse email :" msgid "Thanks" msgstr "Merci" +#: registration/templates/registration/mails/payment_confirmation.html:16 +#, python-format +msgid "" +"We successfully received the payment of %(amount)s € for the TFJM² " +"registration in the team %(team)s!" +msgstr "" +"Nous avons bien reçu le paiement de %(amount)s € pour l'inscription au TFJM² " +"dans l'équipe %(team)s !" + +#: registration/templates/registration/mails/payment_confirmation.html:22 +#: registration/templates/registration/mails/payment_confirmation.txt:9 +msgid "" +"Your registration is now fully completed, and you can work on your solutions." +msgstr "" +"Votre inscription est maintenant complète, et vous pouvez travailler sur vos " +"solutions." + +#: registration/templates/registration/mails/payment_confirmation.html:23 +#: registration/templates/registration/mails/payment_confirmation.txt:10 +msgid "" +"Be sure first that other members of your team also pay their registration." +msgstr "" +"Assurez-vous d'abord que les autres membres de votre équipe aient aussi payé " +"leur inscription." + +#: registration/templates/registration/mails/payment_confirmation.html:27 +#: registration/templates/registration/mails/payment_confirmation.txt:12 +msgid "As a reminder, here are the following important dates:" +msgstr "Pour rappel, voici les dates importantes à venir :" + +#: registration/templates/registration/mails/payment_confirmation.html:29 +#: registration/templates/registration/mails/payment_confirmation.txt:13 +msgid "Deadline to send the solutions:" +msgstr "Date limite pour envoyer les solutions :" + +#: registration/templates/registration/mails/payment_confirmation.html:30 +#: registration/templates/registration/mails/payment_confirmation.txt:14 +msgid "Problems draw:" +msgstr "Tirage des problèmes :" + +#: registration/templates/registration/mails/payment_confirmation.html:31 +#: registration/templates/registration/mails/payment_confirmation.txt:15 +msgid "Tournament dates:" +msgstr "Dates du tournoi :" + +#: registration/templates/registration/mails/payment_confirmation.html:36 +#: registration/templates/registration/mails/payment_confirmation.txt:17 +msgid "" +"Please note that these dates may be subject to change. If your local " +"organizers gave you different dates, trust them." +msgstr "" +"Veuillez noter que ces dates peuvent être sujettes à changement. Si vos " +"organisateur⋅rices locaux⋅ales vous ont donné des dates différentes, faites-" +"leur confiance." + +#: registration/templates/registration/mails/payment_confirmation.html:40 +#: registration/templates/registration/mails/payment_confirmation.txt:19 +msgid "" +"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" +msgstr "" +"NB : Ce mail ne représente pas un justificatif de paiement. La personne qui " +"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.txt:5 +#, python-format +msgid "" +"We successfully received the payment of %(amount)s € for the TFJM² " +"registration in the team %(team)s for the tournament %(tournament)s!" +msgstr "" +"Nous avons bien reçu le paiement de %(amount)s € pour l'inscription au TFJM² " +"dans l'équipe %(team)s pour le tournoi %(tournament)s !" + +#: registration/templates/registration/mails/payment_confirmation.txt:22 +msgid "The TFJM² team" +msgstr "L'équipe du TFJM²" + +#: registration/templates/registration/mails/payment_reminder.html:16 +#: registration/templates/registration/mails/payment_reminder.txt:5 +#, python-format +msgid "" +"You are registered for the TFJM² of %(tournament)s. Your team %(team)s has " +"been successfully validated. To end your inscription, you must pay the " +"amount of %(amount)s €." +msgstr "" +"Vous êtes inscrit⋅e pour le TFJM² du %(tournament)s. Votre équipe %(team)s a " +"été validée avec succès. Pour finaliser votre inscription, vous devez payer " +"le montant de %(amount)s €." + +#: registration/templates/registration/mails/payment_reminder.html:24 +#: registration/templates/registration/mails/payment_reminder.txt:11 +#: registration/templates/registration/payment_form.html:14 +msgid "This price includes the registrations of all members of your team." +msgstr "Ce prix inclut les inscriptions de tous les membres de votre équipe." + +#: registration/templates/registration/mails/payment_reminder.html:29 +#: registration/templates/registration/mails/payment_reminder.txt:14 +msgid "" +"You can pay by credit card or by bank transfer. You can read full " +"instructions on the payment page:" +msgstr "" +"Vous pouvez payer par carte bancaire ou par virement bancaire. Vous pouvez " +"lire les instructions complètes sur la page de paiement :" + +#: registration/templates/registration/mails/payment_reminder.html:39 +#: registration/templates/registration/mails/payment_reminder.txt:18 +msgid "" +"If you have a scholarship, then the registration is free for you. You must " +"then upload it on the payment page using the above link." +msgstr "" +"Si vous bénéficiez d'une bourse, alors l'inscription est gratuite pour vous. " +"Vous )devez alors l'envoyer sur la page de paiement en utilisant le lien ci-" +"dessus." + +#: registration/templates/registration/mails/payment_reminder.html:43 +#: registration/templates/registration/mails/payment_reminder.txt:20 +msgid "" +"It is also possible to allow an external person (your parents, your school, " +"etc.) to pay for you with credit card. Instructions are also available on " +"the payment page." +msgstr "" +"Vous pouvez aussi autoriser une personne externe (vos parents, votre école, " +"etc.) à payer pour vous avec une carte bancaire. Les instructions sont aussi " +"disponibles sur la page de paiement." + +#: registration/templates/registration/mails/payment_reminder.html:47 +#: registration/templates/registration/mails/payment_reminder.txt:22 +msgid "If you have any problem, feel free to contact us." +msgstr "Si vous avez le moindre problème, n'hésitez pas à nous contacter." + #: registration/templates/registration/password_change_done.html:8 msgid "Your password was changed." msgstr "Votre mot de passe a été changé." @@ -2416,10 +2558,6 @@ msgstr "" "Vous devez payer %(amount)s € pour votre inscription dans l'équipe %(team)s " "pour le tournoi %(tournament)s." -#: registration/templates/registration/payment_form.html:14 -msgid "This price includes the registrations of all members of your team." -msgstr "Ce prix inclut les inscriptions de tous les membres de votre équipe." - #: registration/templates/registration/payment_form.html:18 msgid "" "This price includes only your own registration. You are exempt from payment " @@ -2798,7 +2936,7 @@ msgstr "Le code de retour est inconnu : {code}" msgid "The return type is unknown: {type}" msgstr "Le type de retour est inconnu : {type}" -#: registration/views.py:622 +#: registration/views.py:624 msgid "" "The payment has been successfully validated! Your registration is now " "complete." @@ -2806,7 +2944,7 @@ msgstr "" "Le paiement a été validé avec succès ! Votre inscription est désormais " "complète." -#: registration/views.py:627 +#: registration/views.py:630 msgid "" "Your payment is done! The validation of your payment may takes a few " "minutes, and will be automatically done. If it is not the case, please " @@ -2816,27 +2954,27 @@ msgstr "" "quelques minutes, et sera faite automatiquement. Si ce n'est pas le cas, " "merci de nous contacter." -#: registration/views.py:662 +#: registration/views.py:661 #, python-brace-format msgid "Photo authorization of {student}.{ext}" msgstr "Autorisation de droit à l'image de {student}.{ext}" -#: registration/views.py:686 +#: registration/views.py:685 #, python-brace-format msgid "Health sheet of {student}.{ext}" msgstr "Fiche sanitaire de {student}.{ext}" -#: registration/views.py:710 +#: registration/views.py:709 #, python-brace-format msgid "Vaccine sheet of {student}.{ext}" msgstr "Carnet de vaccination de {student}.{ext}" -#: registration/views.py:734 +#: registration/views.py:733 #, python-brace-format msgid "Parental authorization of {student}.{ext}" msgstr "Autorisation parentale de {student}.{ext}" -#: registration/views.py:757 +#: registration/views.py:756 #, python-brace-format msgid "Payment receipt of {user}.{ext}" msgstr "Justificatif de paiement de {user}.{ext}" @@ -3002,7 +3140,3 @@ msgstr "Aucun résultat." #: tfjm/templates/sidebar.html:10 tfjm/templates/sidebar.html:21 msgid "Informations" msgstr "Informations" - -#, python-brace-format -#~ msgid "Scholarship attestation of {user}.{ext}" -#~ msgstr "Notification de bourse de {user}.{ext}" diff --git a/registration/templates/registration/mails/payment_confirmation.html b/registration/templates/registration/mails/payment_confirmation.html new file mode 100644 index 0000000..8d0a182 --- /dev/null +++ b/registration/templates/registration/mails/payment_confirmation.html @@ -0,0 +1,48 @@ +{% load i18n %} + + + + + + + + + +

+ {% trans "Hi" %} {{ user.registration }}, +

+ +

+ {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram %} + We successfully received the payment of {{ amount }} € for the TFJM² registration in the team {{ team }}! + {% endblocktrans %} +

+ +

+ {% trans "Your registration is now fully completed, and you can work on your solutions." %} + {% trans "Be sure first that other members of your team also pay their registration." %} +

+ +

+ {% trans "As a reminder, here are the following important dates:" %} +

    +
  • {% trans "Deadline to send the solutions:" %} {{ payment.tournament.solution_limit|date }}
    • +
  • {% trans "Problems draw:" %} {{ payment.tournament.solutions_draw|date }}
    • +
  • {% trans "Tournament dates:" %} {% trans "From" %} {{ payment.tournament.start|date }} {% trans "to" %} {{ payment.tournament.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 TFJM² team." %}
+

+ + diff --git a/registration/templates/registration/mails/payment_confirmation.txt b/registration/templates/registration/mails/payment_confirmation.txt new file mode 100644 index 0000000..5641cb6 --- /dev/null +++ b/registration/templates/registration/mails/payment_confirmation.txt @@ -0,0 +1,23 @@ +{% load i18n %} + +{% trans "Hi" %} {{ user.registration }}, + +{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %} +We successfully received the payment of {{ amount }} € for the TFJM² registration in the team {{ team }} for the tournament {{ tournament }}! +{% endblocktrans %} + +{% trans "Your registration is now fully completed, and you can work on your solutions." %} +{% trans "Be sure first that other members of your team also pay their registration." %} + +{% trans "As a reminder, here are the following important dates:" %} +* {% trans "Deadline to send the solutions:" %} {{ payment.tournament.solution_limit|date }} +* {% trans "Problems draw:" %} {{ payment.tournament.solutions_draw|date }} +* {% trans "Tournament dates:" %} {% trans "From" %} {{ payment.tournament.start|date }} {% trans "to" %} {{ payment.tournament.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 TFJM² team" %} + diff --git a/registration/templates/registration/mails/payment_reminder.html b/registration/templates/registration/mails/payment_reminder.html new file mode 100644 index 0000000..e3c3973 --- /dev/null +++ b/registration/templates/registration/mails/payment_reminder.html @@ -0,0 +1,55 @@ +{% load i18n %} + + + + + + + + + +

+ {% trans "Hi" %} {{ user.registration }}, +

+ +

+ {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %} + 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 %} + {% trans "This price includes the registrations of all members of your team." %} + {% endif %} +

+ +

+ {% trans "You can pay by credit card or by bank transfer. You can read full instructions on the payment page:" %} +

+ +

+ + https://{{ domain }}{% url "registration.update_payment" pk=payment.pk %} + +

+ +

+ {% trans "If you have a scholarship, then the registration is free for you. You must then upload it on the payment page using the above link." %} +

+ +

+ {% trans "It is also possible to allow an external person (your parents, your school, etc.) to pay for you with credit card. Instructions are also available on the payment page." %} +

+ +

+ {% trans "If you have any problem, feel free to contact us." %} +

+ +-- +

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

+ + diff --git a/registration/templates/registration/mails/payment_reminder.txt b/registration/templates/registration/mails/payment_reminder.txt new file mode 100644 index 0000000..b4cad56 --- /dev/null +++ b/registration/templates/registration/mails/payment_reminder.txt @@ -0,0 +1,25 @@ +{% load i18n %} + +{% trans "Hi" %} {{ user.registration }}, + +{% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %} +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 %} +{% trans "This price includes the registrations of all members of your team." %} +{% endif %} + +{% trans "You can pay by credit card or by bank transfer. You can read full instructions on the payment page:" %} + +https://{{ domain }}{% url "registration.update_payment" pk=payment.pk %} + +{% trans "If you have a scholarship, then the registration is free for you. You must then upload it on the payment page using the above link." %} + +{% trans "It is also possible to allow an external person (your parents, your school, etc.) to pay for you with credit card. Instructions are also available on the payment page." %} + +{% trans "If you have any problem, feel free to contact us." %} + +-- +The TFJM² team