From fb723857739a44b7b654ecb4dc48a9f87a820aa9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 7 Oct 2020 10:59:37 +0200 Subject: [PATCH] =?UTF-8?q?Warn=20users=20that=20they=20have=20to=20open?= =?UTF-8?q?=20they=20Sog=C3=A9=20account?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/de/LC_MESSAGES/django.po | 25 +++++++++++++++++-------- locale/es/LC_MESSAGES/django.po | 25 +++++++++++++++++-------- locale/fr/LC_MESSAGES/django.po | 31 +++++++++++++++++++++++-------- note_kfet/templates/base.html | 24 ++++++++++++++++++------ 4 files changed, 75 insertions(+), 30 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 722e7bdd..f464ca99 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-07 10:23+0200\n" +"POT-Creation-Date: 2020-10-07 10:55+0200\n" "PO-Revision-Date: 2020-09-13 12:39+0200\n" "Last-Translator: elkmaennchen \n" "Language-Team: \n" @@ -2003,7 +2003,7 @@ msgstr "" "Der eingegebene Betrag reicht für die Mitgliedschaft nicht aus, sollte " "mindestens {} betragen" -#: apps/registration/views.py:377 +#: apps/registration/views.py:384 msgid "Invalidate pre-registration" msgstr "Ungültige Vorregistrierung" @@ -2149,7 +2149,7 @@ msgstr "spezielle Transaktion Proxies" msgid "credit transaction" msgstr "Kredit Transaktion" -#: apps/treasury/models.py:369 +#: apps/treasury/models.py:374 msgid "" "This user doesn't have enough money to pay the memberships with its note. " "Please ask her/him to credit the note before invalidating this credit." @@ -2157,16 +2157,16 @@ msgstr "" "Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner " "Note zu bezahlen." -#: apps/treasury/models.py:384 +#: apps/treasury/models.py:389 #: apps/treasury/templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "Kredit von der Société générale" -#: apps/treasury/models.py:385 +#: apps/treasury/models.py:390 msgid "Credits from the Société générale" msgstr "Krediten von der Société générale" -#: apps/treasury/models.py:388 +#: apps/treasury/models.py:393 #, python-brace-format msgid "Soge credit for {user}" msgstr "Kredit von der Société générale für {user}" @@ -3056,7 +3056,7 @@ msgstr "Registrieren" msgid "Log in" msgstr "Anmelden" -#: note_kfet/templates/base.html:155 +#: note_kfet/templates/base.html:156 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -3064,7 +3064,16 @@ msgstr "" "Ihre E-Mail-Adresse ist nicht validiert. Bitte überprüfen Sie Ihren " "Posteingang und klicken Sie auf den Validierungslink." -#: note_kfet/templates/base.html:172 +#: note_kfet/templates/base.html:161 +msgid "" +"You declared that you opened a bank account in the Société générale. The " +"bank did not validate the creation of the account to the BDE, so the " +"registration bonus of 80 € is not credited and the membership is not paid " +"yet. This verification procedure may last a few days. Please make sure that " +"you go to the end of the account creation." +msgstr "" + +#: note_kfet/templates/base.html:184 msgid "Contact us" msgstr "Kontakt" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 6296f3c1..0ad5c21b 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-07 10:23+0200\n" +"POT-Creation-Date: 2020-10-07 10:55+0200\n" "PO-Revision-Date: 2020-09-19 14:56+0200\n" "Last-Translator: elkmaennchen \n" "Language-Team: \n" @@ -1997,7 +1997,7 @@ msgstr "" "El monto dado no es suficiente para las afiliaciones, tiene que ser al menos " "{}" -#: apps/registration/views.py:377 +#: apps/registration/views.py:384 msgid "Invalidate pre-registration" msgstr "Invalidar la afiliación" @@ -2143,7 +2143,7 @@ msgstr "proxys de transacciones especiales" msgid "credit transaction" msgstr "transacción de crédito" -#: apps/treasury/models.py:369 +#: apps/treasury/models.py:374 msgid "" "This user doesn't have enough money to pay the memberships with its note. " "Please ask her/him to credit the note before invalidating this credit." @@ -2152,16 +2152,16 @@ msgstr "" "afiliaciones. Por favor pídelo acreditar su note antes de invalidar este " "crédito." -#: apps/treasury/models.py:384 +#: apps/treasury/models.py:389 #: apps/treasury/templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "Crédito de la Société Générale" -#: apps/treasury/models.py:385 +#: apps/treasury/models.py:390 msgid "Credits from the Société générale" msgstr "Créditos de la Société Générale" -#: apps/treasury/models.py:388 +#: apps/treasury/models.py:393 #, python-brace-format msgid "Soge credit for {user}" msgstr "Crédito de la Société Générale para {user}" @@ -3038,7 +3038,7 @@ msgstr "Registrar" msgid "Log in" msgstr "Conectarse" -#: note_kfet/templates/base.html:155 +#: note_kfet/templates/base.html:156 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -3046,7 +3046,16 @@ msgstr "" "Su correo electrónico no fue validado. Por favor mire en sus correos y haga " "clic en el enlace de validación." -#: note_kfet/templates/base.html:172 +#: note_kfet/templates/base.html:161 +msgid "" +"You declared that you opened a bank account in the Société générale. The " +"bank did not validate the creation of the account to the BDE, so the " +"registration bonus of 80 € is not credited and the membership is not paid " +"yet. This verification procedure may last a few days. Please make sure that " +"you go to the end of the account creation." +msgstr "" + +#: note_kfet/templates/base.html:184 msgid "Contact us" msgstr "Contactarnos" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 21655044..9ed194a7 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-07 10:23+0200\n" +"POT-Creation-Date: 2020-10-07 10:55+0200\n" "PO-Revision-Date: 2020-09-13 12:36+0200\n" "Last-Translator: elkmaennchen \n" "Language-Team: \n" @@ -2004,7 +2004,7 @@ msgstr "" "Le montant crédité est trop faible pour adhérer, il doit être au minimum de " "{}" -#: apps/registration/views.py:377 +#: apps/registration/views.py:384 msgid "Invalidate pre-registration" msgstr "Invalider l'inscription" @@ -2150,7 +2150,7 @@ msgstr "proxys de transactions spéciales" msgid "credit transaction" msgstr "transaction de crédit" -#: apps/treasury/models.py:369 +#: apps/treasury/models.py:374 msgid "" "This user doesn't have enough money to pay the memberships with its note. " "Please ask her/him to credit the note before invalidating this credit." @@ -2158,16 +2158,16 @@ msgstr "" "Cet utilisateur n'a pas assez d'argent pour payer les adhésions avec sa " "note. Merci de lui demander de recharger sa note avant d'invalider ce crédit." -#: apps/treasury/models.py:384 +#: apps/treasury/models.py:389 #: apps/treasury/templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "Crédit de la Société générale" -#: apps/treasury/models.py:385 +#: apps/treasury/models.py:390 msgid "Credits from the Société générale" msgstr "Crédits de la Société générale" -#: apps/treasury/models.py:388 +#: apps/treasury/models.py:393 #, python-brace-format msgid "Soge credit for {user}" msgstr "Crédit de la société générale pour l'utilisateur {user}" @@ -3055,7 +3055,7 @@ msgstr "Inscription" msgid "Log in" msgstr "Se connecter" -#: note_kfet/templates/base.html:155 +#: note_kfet/templates/base.html:156 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -3063,7 +3063,22 @@ msgstr "" "Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail " "et de cliquer sur le lien de validation." -#: note_kfet/templates/base.html:172 +#: note_kfet/templates/base.html:161 +msgid "" +"You declared that you opened a bank account in the Société générale. The " +"bank did not validate the creation of the account to the BDE, so the " +"registration bonus of 80 € is not credited and the membership is not paid " +"yet. This verification procedure may last a few days. Please make sure that " +"you go to the end of the account creation." +msgstr "" +"Vous avez déclaré que vous avez ouvert un compte bancaire à la société " +"générale. La banque n'a pas encore validé la création du compte auprès du " +"BDE, le bonus d'inscription de 80 € n'a donc pas encore été créditée et " +"l'adhésion n'est pas encore payée. Cette procédure de vérification peut " +"durer quelques jours. Merci de vous assurer de bien aller au bout de vos " +"démarches." + +#: note_kfet/templates/base.html:184 msgid "Contact us" msgstr "Nous contacter" diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index 79ea6ea9..e597d5ca 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -150,12 +150,24 @@ SPDX-License-Identifier: GPL-3.0-or-later
- {% if request.user.is_authenticated and not request.user.profile.email_confirmed %} -
- {% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %} -
- {% endif %} -
+
+ {% if request.user.is_authenticated and not request.user.profile.email_confirmed %} +
+ {% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %} +
+ {% endif %} + {% if user.sogecredit and not user.sogecredit.valid %} +
+ {% blocktrans trimmed %} + You declared that you opened a bank account in the Société générale. The bank did not validate the creation of the account to the BDE, + so the registration bonus of 80 € is not credited and the membership is not paid yet. + This verification procedure may last a few days. + Please make sure that you go to the end of the account creation. + {% endblocktrans %} +
+ {% endif %} + {# TODO Add banners #} +
{% block content %}

Default content...

{% endblock %}