From dc6a5f56f6893a81a0823117d7a4c108485b9290 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 7 Sep 2020 19:44:54 +0200 Subject: [PATCH] Remove WEI mention from register page and mail --- .../email_validation_email_sent.html | 2 +- .../mails/email_validation_email.html | 4 +- .../mails/email_validation_email.txt | 4 +- locale/de/LC_MESSAGES/django.po | 55 ++++++++----------- locale/fr/LC_MESSAGES/django.po | 45 +++++++-------- 5 files changed, 49 insertions(+), 61 deletions(-) diff --git a/apps/registration/templates/registration/email_validation_email_sent.html b/apps/registration/templates/registration/email_validation_email_sent.html index 87691670..f6db4cac 100644 --- a/apps/registration/templates/registration/email_validation_email_sent.html +++ b/apps/registration/templates/registration/email_validation_email_sent.html @@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "An email has been sent. Please click on the link to activate your account." %}

- {% trans "You must also go to the Kfet to pay your membership. The WEI registration includes the BDE membership." %} + {% trans "You must also go to the Kfet to pay your membership." %}

diff --git a/apps/registration/templates/registration/mails/email_validation_email.html b/apps/registration/templates/registration/mails/email_validation_email.html index 0d5b41f5..40d246c9 100644 --- a/apps/registration/templates/registration/mails/email_validation_email.html +++ b/apps/registration/templates/registration/mails/email_validation_email.html @@ -27,7 +27,7 @@

- {% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet. Note that the WEI registration includes the Kfet membership." %} + {% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet." %}

@@ -38,4 +38,4 @@

{% trans "The Note Kfet team." %}
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %} -

\ No newline at end of file +

diff --git a/apps/registration/templates/registration/mails/email_validation_email.txt b/apps/registration/templates/registration/mails/email_validation_email.txt index 5ce48110..7b280bb2 100644 --- a/apps/registration/templates/registration/mails/email_validation_email.txt +++ b/apps/registration/templates/registration/mails/email_validation_email.txt @@ -8,9 +8,9 @@ https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=toke {% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %} -{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet. Note that the WEI registration includes the Kfet membership." %} +{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet." %} {% trans "Thanks" %}, {% trans "The Note Kfet team." %} -{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %} \ No newline at end of file +{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index c3bed92d..3891a934 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-09-07 11:14+0200\n" +"POT-Creation-Date: 2020-09-07 19:43+0200\n" "PO-Revision-Date: 2020-09-03 23:47+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -187,10 +187,9 @@ msgid "Entry for {guest}, invited by {note} to the activity {activity}" msgstr "Eintritt für {guest}, von {note} zur Vanstaltung {activity} eingeladen" #: apps/activity/models.py:194 -#, fuzzy, python-brace-format -#| msgid "Entry for activity \"{}\"" +#, python-brace-format msgid "Entry for {note} to the activity {activity}" -msgstr "Eintritt zur Veranstaltung \"{}\"" +msgstr "Eintritt von {note} zur Veranstaltung {activity}" #: apps/activity/models.py:201 msgid "Already entered on " @@ -1494,7 +1493,8 @@ msgstr "Verlauf der letzten Transaktionen" #: apps/note/templates/note/mails/negative_balance.txt:25 #: apps/note/templates/note/mails/negative_notes_report.html:46 #: apps/note/templates/note/mails/negative_notes_report.txt:13 -#: apps/note/templates/note/mails/weekly_report.html:54 +#: apps/note/templates/note/mails/weekly_report.html:51 +#: apps/note/templates/note/mails/weekly_report.txt:32 #: apps/registration/templates/registration/mails/email_validation_email.html:40 #: apps/registration/templates/registration/mails/email_validation_email.txt:16 msgid "Mail generated by the Note Kfet on the" @@ -1694,7 +1694,7 @@ msgstr "" "Sie haben nicht die Berechtigung, das Feld {field} in dieser Instanz von " "Modell {app_label} zu ändern. {model_name}" -#: apps/permission/signals.py:73 apps/permission/views.py:101 +#: apps/permission/signals.py:73 apps/permission/views.py:89 #, python-brace-format msgid "" "You don't have the permission to add an instance of model {app_label}." @@ -1703,7 +1703,7 @@ msgstr "" "Sie haben nicht die Berechtigung, eine Instanz von model {app_label}. " "{model_name} hinzufügen." -#: apps/permission/signals.py:101 +#: apps/permission/signals.py:102 #, python-brace-format msgid "" "You don't have the permission to delete this instance of model {app_label}." @@ -1752,7 +1752,7 @@ msgstr "Abfrage:" msgid "No associated permission" msgstr "Keine zugehörige Berechtigung" -#: apps/permission/views.py:68 +#: apps/permission/views.py:56 #, python-brace-format msgid "" "You don't have the permission to update this instance of the model " @@ -1762,7 +1762,7 @@ msgstr "" "diesen Parametern zu aktualisieren. Bitte korrigieren Sie Ihre Daten und " "versuchen Sie es erneut." -#: apps/permission/views.py:72 +#: apps/permission/views.py:60 #, python-brace-format msgid "" "You don't have the permission to create an instance of the model \"{model}\" " @@ -1772,11 +1772,11 @@ msgstr "" "diesen Parametern zu erstellen. Bitte korrigieren Sie Ihre Daten und " "versuchen Sie es erneut." -#: apps/permission/views.py:108 note_kfet/templates/base.html:106 +#: apps/permission/views.py:96 note_kfet/templates/base.html:106 msgid "Rights" msgstr "Rechten" -#: apps/permission/views.py:113 +#: apps/permission/views.py:101 msgid "All rights" msgstr "Alle Rechten" @@ -1809,23 +1809,23 @@ msgstr "BDE Mitglieder werden" msgid "Join Kfet Club" msgstr "Kfet Mitglieder werden" -#: apps/registration/templates/registration/email_validation_complete.html:9 +#: apps/registration/templates/registration/email_validation_complete.html:15 msgid "Your email have successfully been validated." msgstr "Ihre E-Mail wurde erfolgreich validiert." -#: apps/registration/templates/registration/email_validation_complete.html:11 +#: apps/registration/templates/registration/email_validation_complete.html:19 #, python-format msgid "You can now log in." msgstr "Sie können sich jetz anmelden ." -#: apps/registration/templates/registration/email_validation_complete.html:13 +#: apps/registration/templates/registration/email_validation_complete.html:23 msgid "" "You must pay now your membership in the Kfet to complete your registration." msgstr "" "Sie müssen jetzt Ihre Mitgliedschaft im Kfet bezahlen, um Ihre Registrierung " "abzuschließen." -#: apps/registration/templates/registration/email_validation_complete.html:16 +#: apps/registration/templates/registration/email_validation_complete.html:28 msgid "" "The link was invalid. The token may have expired. Please send us an email to " "activate your account." @@ -1833,24 +1833,20 @@ msgstr "" "Der Link war ungültig. Das Token ist möglicherweise abgelaufen. Bitte senden " "Sie uns eine E-Mail, um Ihr Konto zu aktivieren." -#: apps/registration/templates/registration/email_validation_email_sent.html:8 +#: apps/registration/templates/registration/email_validation_email_sent.html:10 msgid "Account activation" msgstr "Kontoaktivierung" -#: apps/registration/templates/registration/email_validation_email_sent.html:11 +#: apps/registration/templates/registration/email_validation_email_sent.html:14 msgid "" "An email has been sent. Please click on the link to activate your account." msgstr "" "Eine E-Mail wurde gesendet. Bitte klicken Sie auf den Link, um Ihr Konto zu " "aktivieren." -#: apps/registration/templates/registration/email_validation_email_sent.html:15 -msgid "" -"You must also go to the Kfet to pay your membership. The WEI registration " -"includes the BDE membership." -msgstr "" -"Sie müssen auch zum Kfet gehen, um Ihre Mitgliedschaft zu bezahlen. Die WEI-" -"Registrierung beinhaltet die BDE-Mitgliedschaft." +#: apps/registration/templates/registration/email_validation_email_sent.html:17 +msgid "You must also go to the Kfet to pay your membership." +msgstr "Sie müssen auch zum Kfet gehen, um Ihre Mitgliedschaft zu bezahlen." #: apps/registration/templates/registration/future_profile_detail.html:49 #: apps/wei/templates/wei/weiregistration_confirm_delete.html:11 @@ -1898,12 +1894,10 @@ msgstr "" #: apps/registration/templates/registration/mails/email_validation_email.txt:11 msgid "" "After that, you'll have to wait that someone validates your account before " -"you can log in. You will need to pay your membership in the Kfet. Note that " -"the WEI registration includes the Kfet membership." +"you can log in. You will need to pay your membership in the Kfet." msgstr "" "Danach müssen Sie warten, bis jemand Ihr Konto validiert, bevor Sie sich " -"anmelden können. Sie müssen Ihre Mitgliedschaft im Kfet bezahlen. Beachten " -"Sie, dass die WEI-Registrierung die Kfet-Mitgliedschaft enthält." +"anmelden können. Sie müssen Ihre Mitgliedschaft im Kfet bezahlen." #: apps/registration/templates/registration/mails/email_validation_email.html:34 #: apps/registration/templates/registration/mails/email_validation_email.txt:13 @@ -2044,10 +2038,9 @@ msgid "invoices" msgstr "Rechnungen" #: apps/treasury/models.py:113 -#, fuzzy, python-brace-format -#| msgid "Invoice #{:d}" +#, python-brace-format msgid "Invoice #{id}" -msgstr "Rechnung #{:d}" +msgstr "Rechnung #{id}" #: apps/treasury/models.py:130 msgid "Designation" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 7c2ee43b..5e6e2740 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-09-07 11:14+0200\n" +"POT-Creation-Date: 2020-09-07 19:43+0200\n" "PO-Revision-Date: 2020-09-02 23:18+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -1498,7 +1498,8 @@ msgstr "Historique des transactions récentes" #: apps/note/templates/note/mails/negative_balance.txt:25 #: apps/note/templates/note/mails/negative_notes_report.html:46 #: apps/note/templates/note/mails/negative_notes_report.txt:13 -#: apps/note/templates/note/mails/weekly_report.html:54 +#: apps/note/templates/note/mails/weekly_report.html:51 +#: apps/note/templates/note/mails/weekly_report.txt:32 #: apps/registration/templates/registration/mails/email_validation_email.html:40 #: apps/registration/templates/registration/mails/email_validation_email.txt:16 msgid "Mail generated by the Note Kfet on the" @@ -1700,7 +1701,7 @@ msgstr "" "Vous n'avez pas la permission de modifier le champ {field} sur l'instance du " "modèle {app_label}.{model_name}." -#: apps/permission/signals.py:73 apps/permission/views.py:101 +#: apps/permission/signals.py:73 apps/permission/views.py:89 #, python-brace-format msgid "" "You don't have the permission to add an instance of model {app_label}." @@ -1709,7 +1710,7 @@ msgstr "" "Vous n'avez pas la permission d'ajouter une instance du modèle {app_label}." "{model_name}." -#: apps/permission/signals.py:101 +#: apps/permission/signals.py:102 #, python-brace-format msgid "" "You don't have the permission to delete this instance of model {app_label}." @@ -1759,7 +1760,7 @@ msgstr "Requête :" msgid "No associated permission" msgstr "Pas de permission associée" -#: apps/permission/views.py:68 +#: apps/permission/views.py:56 #, python-brace-format msgid "" "You don't have the permission to update this instance of the model " @@ -1768,7 +1769,7 @@ msgstr "" "Vous n'avez pas la permission de modifier cette instance du modèle « {model} " "» avec ces paramètres. Merci de les corriger et de réessayer." -#: apps/permission/views.py:72 +#: apps/permission/views.py:60 #, python-brace-format msgid "" "You don't have the permission to create an instance of the model \"{model}\" " @@ -1777,11 +1778,11 @@ msgstr "" "Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » " "avec ces paramètres. Merci de les corriger et de réessayer." -#: apps/permission/views.py:108 note_kfet/templates/base.html:106 +#: apps/permission/views.py:96 note_kfet/templates/base.html:106 msgid "Rights" msgstr "Droits" -#: apps/permission/views.py:113 +#: apps/permission/views.py:101 msgid "All rights" msgstr "Tous les droits" @@ -1814,23 +1815,23 @@ msgstr "Adhérer au club BDE" msgid "Join Kfet Club" msgstr "Adhérer au club Kfet" -#: apps/registration/templates/registration/email_validation_complete.html:9 +#: apps/registration/templates/registration/email_validation_complete.html:15 msgid "Your email have successfully been validated." msgstr "Votre adresse e-mail a bien été validée." -#: apps/registration/templates/registration/email_validation_complete.html:11 +#: apps/registration/templates/registration/email_validation_complete.html:19 #, python-format msgid "You can now log in." msgstr "Vous pouvez désormais vous connecter." -#: apps/registration/templates/registration/email_validation_complete.html:13 +#: apps/registration/templates/registration/email_validation_complete.html:23 msgid "" "You must pay now your membership in the Kfet to complete your registration." msgstr "" "Vous devez désormais payer votre adhésion à la Kfet pour compléter votre " "inscription." -#: apps/registration/templates/registration/email_validation_complete.html:16 +#: apps/registration/templates/registration/email_validation_complete.html:28 msgid "" "The link was invalid. The token may have expired. Please send us an email to " "activate your account." @@ -1838,24 +1839,20 @@ msgstr "" "Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter " "pour activer votre compte." -#: apps/registration/templates/registration/email_validation_email_sent.html:8 +#: apps/registration/templates/registration/email_validation_email_sent.html:10 msgid "Account activation" msgstr "Activation du compte" -#: apps/registration/templates/registration/email_validation_email_sent.html:11 +#: apps/registration/templates/registration/email_validation_email_sent.html:14 msgid "" "An email has been sent. Please click on the link to activate your account." msgstr "" "Un email vient de vous être envoyé. Merci de cliquer sur le lien de " "validation pour activer votre compte." -#: apps/registration/templates/registration/email_validation_email_sent.html:15 -msgid "" -"You must also go to the Kfet to pay your membership. The WEI registration " -"includes the BDE membership." -msgstr "" -"Vous devrez également vous rendre à la Kfet pour payer votre adhésion. " -"L'inscription au WEI inclut l'adhésion au BDE." +#: apps/registration/templates/registration/email_validation_email_sent.html:17 +msgid "You must also go to the Kfet to pay your membership." +msgstr "Vous devrez également vous rendre à la Kfet pour payer votre adhésion." #: apps/registration/templates/registration/future_profile_detail.html:49 #: apps/wei/templates/wei/weiregistration_confirm_delete.html:11 @@ -1901,12 +1898,10 @@ msgstr "Ce lien n'est valide que pendant quelques jours." #: apps/registration/templates/registration/mails/email_validation_email.txt:11 msgid "" "After that, you'll have to wait that someone validates your account before " -"you can log in. You will need to pay your membership in the Kfet. Note that " -"the WEI registration includes the Kfet membership." +"you can log in. You will need to pay your membership in the Kfet." msgstr "" "Après cela, vous devrez attendre que quelqu'un valide votre compte avant de " -"pouvoir vous connecter. Vous devrez payer votre adhésion à la Kfet. Notez " -"que l'adhésion Kfet est incluse dans l'inscription au WEI." +"pouvoir vous connecter. Vous devrez payer votre adhésion à la Kfet." #: apps/registration/templates/registration/mails/email_validation_email.html:34 #: apps/registration/templates/registration/mails/email_validation_email.txt:13