From fc511689b0d98a3c83f9225b7917afc02675a98f Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 9 Apr 2020 22:03:26 +0200
Subject: [PATCH] Update mail translation
---
apps/member/models.py | 7 +-
apps/registration/views.py | 1 +
locale/de/LC_MESSAGES/django.po | 151 ++++++++++-------
locale/fr/LC_MESSAGES/django.po | 158 +++++++++++-------
.../email_validation_complete.html | 21 ++-
.../registration/email_validation_email.html | 11 --
.../mails/email_validation_email.html | 15 ++
7 files changed, 223 insertions(+), 141 deletions(-)
delete mode 100644 templates/registration/email_validation_email.html
create mode 100644 templates/registration/mails/email_validation_email.html
diff --git a/apps/member/models.py b/apps/member/models.py
index c51a95c8..3a022434 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
import datetime
+import os
from django.conf import settings
from django.contrib.auth.models import User
@@ -79,12 +80,10 @@ class Profile(models.Model):
def send_email_validation_link(self):
subject = "Activate your Note Kfet account"
- message = loader.render_to_string('registration/email_validation_email.html',
+ message = loader.render_to_string('registration/mails/email_validation_email.html',
{
'user': self.user,
- 'domain': "nk20.ynerant.fr",
- 'site_name': "La Note Kfet",
- 'protocol': 'https',
+ 'domain': os.getenv("NOTE_URL", "note.example.com"),
'token': email_validation_token.make_token(self.user),
'uid': urlsafe_base64_encode(force_bytes(self.user.pk)).decode('UTF-8'),
})
diff --git a/apps/registration/views.py b/apps/registration/views.py
index 575ada8f..35391b05 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -112,6 +112,7 @@ class UserValidateView(TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
+ context['user'] = self.get_user(self.kwargs["uidb64"])
context['login_url'] = resolve_url(settings.LOGIN_URL)
if self.validlink:
context['validlink'] = True
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index ff98db5b..f616ffd6 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-06 10:51+0200\n"
+"POT-Creation-Date: 2020-04-09 21:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgid "You can't invite more than 3 people to this activity."
msgstr ""
#: apps/activity/models.py:23 apps/activity/models.py:48
-#: apps/member/models.py:100 apps/member/models.py:203
+#: apps/member/models.py:99 apps/member/models.py:202
#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24
#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237
#: templates/member/club_info.html:13 templates/member/profile_info.html:14
@@ -79,7 +79,7 @@ msgstr ""
msgid "type"
msgstr ""
-#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224
+#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:223
#: apps/note/models/notes.py:117
msgid "user"
msgstr ""
@@ -300,152 +300,152 @@ msgstr ""
msgid "Bank"
msgstr ""
-#: apps/member/models.py:32
+#: apps/member/models.py:33
#: templates/registration/future_profile_detail.html:47
msgid "phone number"
msgstr ""
-#: apps/member/models.py:38 templates/member/profile_info.html:27
+#: apps/member/models.py:39 templates/member/profile_info.html:27
#: templates/registration/future_profile_detail.html:41
msgid "section"
msgstr ""
-#: apps/member/models.py:39
+#: apps/member/models.py:40
msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
msgstr ""
-#: apps/member/models.py:45 templates/member/profile_info.html:30
+#: apps/member/models.py:46 templates/member/profile_info.html:30
#: templates/registration/future_profile_detail.html:44
msgid "address"
msgstr ""
-#: apps/member/models.py:51
+#: apps/member/models.py:52
#: templates/registration/future_profile_detail.html:50
msgid "paid"
msgstr ""
-#: apps/member/models.py:52
+#: apps/member/models.py:53
msgid "Tells if the user receive a salary."
msgstr ""
-#: apps/member/models.py:57
+#: apps/member/models.py:58
msgid "email confirmed"
msgstr ""
-#: apps/member/models.py:62
+#: apps/member/models.py:63
msgid "registration valid"
msgstr ""
-#: apps/member/models.py:67
+#: apps/member/models.py:68
msgid "Société générale"
msgstr ""
-#: apps/member/models.py:68
+#: apps/member/models.py:69
msgid "Has the user ever be paid by the Société générale?"
msgstr ""
-#: apps/member/models.py:73 apps/member/models.py:74
+#: apps/member/models.py:74 apps/member/models.py:75
msgid "user profile"
msgstr ""
-#: apps/member/models.py:105 templates/member/club_info.html:46
+#: apps/member/models.py:104 templates/member/club_info.html:46
#: templates/registration/future_profile_detail.html:22
msgid "email"
msgstr ""
-#: apps/member/models.py:112
+#: apps/member/models.py:111
msgid "parent club"
msgstr ""
-#: apps/member/models.py:121
+#: apps/member/models.py:120
msgid "require memberships"
msgstr ""
-#: apps/member/models.py:122
+#: apps/member/models.py:121
msgid "Uncheck if this club don't require memberships."
msgstr ""
-#: apps/member/models.py:127 templates/member/club_info.html:35
+#: apps/member/models.py:126 templates/member/club_info.html:35
msgid "membership fee (paid students)"
msgstr ""
-#: apps/member/models.py:132 templates/member/club_info.html:38
+#: apps/member/models.py:131 templates/member/club_info.html:38
msgid "membership fee (unpaid students)"
msgstr ""
-#: apps/member/models.py:138 templates/member/club_info.html:28
+#: apps/member/models.py:137 templates/member/club_info.html:28
msgid "membership duration"
msgstr ""
-#: apps/member/models.py:139
+#: apps/member/models.py:138
msgid "The longest time (in days) a membership can last (NULL = infinite)."
msgstr ""
-#: apps/member/models.py:146 templates/member/club_info.html:22
+#: apps/member/models.py:145 templates/member/club_info.html:22
msgid "membership start"
msgstr ""
-#: apps/member/models.py:147
+#: apps/member/models.py:146
msgid "How long after January 1st the members can renew their membership."
msgstr ""
-#: apps/member/models.py:154 templates/member/club_info.html:25
+#: apps/member/models.py:153 templates/member/club_info.html:25
msgid "membership end"
msgstr ""
-#: apps/member/models.py:155
+#: apps/member/models.py:154
msgid ""
"How long the membership can last after January 1st of the next year after "
"members can renew their membership."
msgstr ""
-#: apps/member/models.py:188 apps/member/models.py:230
+#: apps/member/models.py:187 apps/member/models.py:229
#: apps/note/models/notes.py:139
msgid "club"
msgstr ""
-#: apps/member/models.py:189
+#: apps/member/models.py:188
msgid "clubs"
msgstr ""
-#: apps/member/models.py:209 apps/permission/models.py:294
+#: apps/member/models.py:208 apps/permission/models.py:294
msgid "role"
msgstr ""
-#: apps/member/models.py:210 apps/member/models.py:235
+#: apps/member/models.py:209 apps/member/models.py:234
msgid "roles"
msgstr ""
-#: apps/member/models.py:240
+#: apps/member/models.py:239
msgid "membership starts on"
msgstr ""
-#: apps/member/models.py:244
+#: apps/member/models.py:243
msgid "membership ends on"
msgstr ""
-#: apps/member/models.py:249
+#: apps/member/models.py:248
msgid "fee"
msgstr ""
-#: apps/member/models.py:267 apps/member/views.py:491
+#: apps/member/models.py:266 apps/member/views.py:500
msgid "User is not a member of the parent club"
msgstr ""
-#: apps/member/models.py:277 apps/member/views.py:500
+#: apps/member/models.py:276 apps/member/views.py:509
msgid "User is already a member of the club"
msgstr ""
-#: apps/member/models.py:315
+#: apps/member/models.py:314
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr ""
-#: apps/member/models.py:318
+#: apps/member/models.py:317
msgid "membership"
msgstr ""
-#: apps/member/models.py:319
+#: apps/member/models.py:318
msgid "memberships"
msgstr ""
@@ -466,27 +466,27 @@ msgstr ""
msgid "An alias with a similar name already exists."
msgstr ""
-#: apps/member/views.py:175
+#: apps/member/views.py:180
msgid "Search user"
msgstr ""
-#: apps/member/views.py:486
+#: apps/member/views.py:495
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
msgstr ""
-#: apps/member/views.py:504
+#: apps/member/views.py:513
msgid "The membership must start after {:%m-%d-%Y}."
msgstr ""
-#: apps/member/views.py:509
+#: apps/member/views.py:518
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr ""
-#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523
-#: apps/registration/views.py:285 apps/registration/views.py:287
-#: apps/registration/views.py:289
+#: apps/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532
+#: apps/registration/views.py:286 apps/registration/views.py:288
+#: apps/registration/views.py:290
msgid "This field is required."
msgstr ""
@@ -785,27 +785,27 @@ msgstr ""
msgid "Email validation"
msgstr ""
-#: apps/registration/views.py:120
+#: apps/registration/views.py:121
msgid "Email validation unsuccessful"
msgstr ""
-#: apps/registration/views.py:131
+#: apps/registration/views.py:132
msgid "Email validation email sent"
msgstr ""
-#: apps/registration/views.py:184
+#: apps/registration/views.py:185
msgid "Unregistered users"
msgstr ""
-#: apps/registration/views.py:251
+#: apps/registration/views.py:252
msgid "You must join the BDE."
msgstr ""
-#: apps/registration/views.py:273
+#: apps/registration/views.py:274
msgid "You must join BDE club before joining Kfet club."
msgstr ""
-#: apps/registration/views.py:278
+#: apps/registration/views.py:279
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
@@ -1161,11 +1161,11 @@ msgstr ""
msgid "club listing "
msgstr ""
-#: templates/member/club_tables.html:9
+#: templates/member/club_tables.html:6
msgid "Member of the Club"
msgstr ""
-#: templates/member/club_tables.html:22 templates/member/profile_tables.html:31
+#: templates/member/club_tables.html:17 templates/member/profile_tables.html:28
msgid "Transaction history"
msgstr ""
@@ -1219,7 +1219,7 @@ msgstr ""
msgid "Click here to resend a validation link."
msgstr ""
-#: templates/member/profile_tables.html:18
+#: templates/member/profile_tables.html:15
msgid "View my memberships"
msgstr ""
@@ -1314,14 +1314,21 @@ msgstr ""
msgid "Unable to delete button "
msgstr ""
+#: templates/registration/email_validation_complete.html:6
+msgid "Your email have successfully been validated."
+msgstr ""
+
#: templates/registration/email_validation_complete.html:8
#, python-format
+msgid "You can now <a href=\"%(login_url)s\">log in</a>."
+msgstr ""
+
+#: templates/registration/email_validation_complete.html:10
msgid ""
-"Your account have successfully been activated. You can now <a href="
-"\"%(login_url)s\">log in</a>."
+"You must pay now your membership in the Kfet to complete your registration."
msgstr ""
-#: templates/registration/email_validation_complete.html:12
+#: templates/registration/email_validation_complete.html:13
msgid ""
"The link was invalid. The token may have expired. Please send us an email to "
"activate your account."
@@ -1376,6 +1383,36 @@ msgstr ""
msgid "Forgotten your password or username?"
msgstr ""
+#: templates/registration/mails/email_validation_email.html:3
+msgid "Hi"
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html:5
+msgid ""
+"You recently registered on the Note Kfet. Please click on the link below to "
+"confirm your registration."
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html:9
+msgid ""
+"This link is only valid for a couple of days, after that you will need to "
+"contact us to validate your email."
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html: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."
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html:13
+msgid "Thanks"
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html:15
+msgid "The Note Kfet team."
+msgstr ""
+
#: templates/registration/password_change_done.html:8
msgid "Your password was changed."
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index be518ebf..27636a65 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-06 10:51+0200\n"
+"POT-Creation-Date: 2020-04-09 21:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "You can't invite more than 3 people to this activity."
msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
#: apps/activity/models.py:23 apps/activity/models.py:48
-#: apps/member/models.py:100 apps/member/models.py:203
+#: apps/member/models.py:99 apps/member/models.py:202
#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24
#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237
#: templates/member/club_info.html:13 templates/member/profile_info.html:14
@@ -75,7 +75,7 @@ msgstr "description"
msgid "type"
msgstr "type"
-#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224
+#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:223
#: apps/note/models/notes.py:117
msgid "user"
msgstr "utilisateur"
@@ -296,102 +296,102 @@ msgstr "Montant à créditer"
msgid "Bank"
msgstr "Banque"
-#: apps/member/models.py:32
+#: apps/member/models.py:33
#: templates/registration/future_profile_detail.html:47
msgid "phone number"
msgstr "numéro de téléphone"
-#: apps/member/models.py:38 templates/member/profile_info.html:27
+#: apps/member/models.py:39 templates/member/profile_info.html:27
#: templates/registration/future_profile_detail.html:41
msgid "section"
msgstr "section"
-#: apps/member/models.py:39
+#: apps/member/models.py:40
msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
-#: apps/member/models.py:45 templates/member/profile_info.html:30
+#: apps/member/models.py:46 templates/member/profile_info.html:30
#: templates/registration/future_profile_detail.html:44
msgid "address"
msgstr "adresse"
-#: apps/member/models.py:51
+#: apps/member/models.py:52
#: templates/registration/future_profile_detail.html:50
msgid "paid"
msgstr "payé"
-#: apps/member/models.py:52
+#: apps/member/models.py:53
msgid "Tells if the user receive a salary."
msgstr "Indique si l'utilisateur perçoit un salaire."
-#: apps/member/models.py:57
+#: apps/member/models.py:58
msgid "email confirmed"
msgstr "adresse email confirmée"
-#: apps/member/models.py:62
+#: apps/member/models.py:63
msgid "registration valid"
msgstr "inscription valid"
-#: apps/member/models.py:67
+#: apps/member/models.py:68
msgid "Société générale"
msgstr "Société générale"
-#: apps/member/models.py:68
+#: apps/member/models.py:69
msgid "Has the user ever be paid by the Société générale?"
msgstr "Est-ce que l'utilisateur a déjà été payé par la Société Générale ?"
-#: apps/member/models.py:73 apps/member/models.py:74
+#: apps/member/models.py:74 apps/member/models.py:75
msgid "user profile"
msgstr "profil utilisateur"
-#: apps/member/models.py:105 templates/member/club_info.html:46
+#: apps/member/models.py:104 templates/member/club_info.html:46
#: templates/registration/future_profile_detail.html:22
msgid "email"
msgstr "courriel"
-#: apps/member/models.py:112
+#: apps/member/models.py:111
msgid "parent club"
msgstr "club parent"
-#: apps/member/models.py:121
+#: apps/member/models.py:120
msgid "require memberships"
msgstr "nécessite des adhésions"
-#: apps/member/models.py:122
+#: apps/member/models.py:121
msgid "Uncheck if this club don't require memberships."
msgstr "Décochez si ce club n'utilise pas d'adhésions."
-#: apps/member/models.py:127 templates/member/club_info.html:35
+#: apps/member/models.py:126 templates/member/club_info.html:35
msgid "membership fee (paid students)"
msgstr "cotisation pour adhérer (normalien élève)"
-#: apps/member/models.py:132 templates/member/club_info.html:38
+#: apps/member/models.py:131 templates/member/club_info.html:38
msgid "membership fee (unpaid students)"
msgstr "cotisation pour adhérer (normalien étudiant)"
-#: apps/member/models.py:138 templates/member/club_info.html:28
+#: apps/member/models.py:137 templates/member/club_info.html:28
msgid "membership duration"
msgstr "durée de l'adhésion"
-#: apps/member/models.py:139
+#: apps/member/models.py:138
msgid "The longest time (in days) a membership can last (NULL = infinite)."
msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)."
-#: apps/member/models.py:146 templates/member/club_info.html:22
+#: apps/member/models.py:145 templates/member/club_info.html:22
msgid "membership start"
msgstr "début de l'adhésion"
-#: apps/member/models.py:147
+#: apps/member/models.py:146
msgid "How long after January 1st the members can renew their membership."
msgstr ""
"Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur "
"adhésion."
-#: apps/member/models.py:154 templates/member/club_info.html:25
+#: apps/member/models.py:153 templates/member/club_info.html:25
msgid "membership end"
msgstr "fin de l'adhésion"
-#: apps/member/models.py:155
+#: apps/member/models.py:154
msgid ""
"How long the membership can last after January 1st of the next year after "
"members can renew their membership."
@@ -399,53 +399,53 @@ msgstr ""
"Combien de temps l'adhésion peut durer après le 1er Janvier de l'année "
"suivante avant que les adhérents peuvent renouveler leur adhésion."
-#: apps/member/models.py:188 apps/member/models.py:230
+#: apps/member/models.py:187 apps/member/models.py:229
#: apps/note/models/notes.py:139
msgid "club"
msgstr "club"
-#: apps/member/models.py:189
+#: apps/member/models.py:188
msgid "clubs"
msgstr "clubs"
-#: apps/member/models.py:209 apps/permission/models.py:294
+#: apps/member/models.py:208 apps/permission/models.py:294
msgid "role"
msgstr "rôle"
-#: apps/member/models.py:210 apps/member/models.py:235
+#: apps/member/models.py:209 apps/member/models.py:234
msgid "roles"
msgstr "rôles"
-#: apps/member/models.py:240
+#: apps/member/models.py:239
msgid "membership starts on"
msgstr "l'adhésion commence le"
-#: apps/member/models.py:244
+#: apps/member/models.py:243
msgid "membership ends on"
msgstr "l'adhésion finit le"
-#: apps/member/models.py:249
+#: apps/member/models.py:248
msgid "fee"
msgstr "cotisation"
-#: apps/member/models.py:267 apps/member/views.py:491
+#: apps/member/models.py:266 apps/member/views.py:500
msgid "User is not a member of the parent club"
msgstr "L'utilisateur n'est pas membre du club parent"
-#: apps/member/models.py:277 apps/member/views.py:500
+#: apps/member/models.py:276 apps/member/views.py:509
msgid "User is already a member of the club"
msgstr "L'utilisateur est déjà membre du club"
-#: apps/member/models.py:315
+#: apps/member/models.py:314
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr "Adhésion de {user} pour le club {club}"
-#: apps/member/models.py:318
+#: apps/member/models.py:317
msgid "membership"
msgstr "adhésion"
-#: apps/member/models.py:319
+#: apps/member/models.py:318
msgid "memberships"
msgstr "adhésions"
@@ -466,11 +466,11 @@ msgstr "Modifier le profil"
msgid "An alias with a similar name already exists."
msgstr "Un alias avec un nom similaire existe déjà ."
-#: apps/member/views.py:175
+#: apps/member/views.py:180
msgid "Search user"
msgstr "Chercher un utilisateur"
-#: apps/member/views.py:486
+#: apps/member/views.py:495
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@@ -478,17 +478,17 @@ msgstr ""
"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
"avoir un solde négatif."
-#: apps/member/views.py:504
+#: apps/member/views.py:513
msgid "The membership must start after {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
-#: apps/member/views.py:509
+#: apps/member/views.py:518
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
-#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523
-#: apps/registration/views.py:285 apps/registration/views.py:287
-#: apps/registration/views.py:289
+#: apps/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532
+#: apps/registration/views.py:286 apps/registration/views.py:288
+#: apps/registration/views.py:290
msgid "This field is required."
msgstr "Ce champ est requis."
@@ -788,27 +788,27 @@ msgstr "Adhérer au club Kfet"
msgid "Email validation"
msgstr "Validation de l'adresse mail"
-#: apps/registration/views.py:120
+#: apps/registration/views.py:121
msgid "Email validation unsuccessful"
msgstr " La validation de l'adresse mail a échoué"
-#: apps/registration/views.py:131
+#: apps/registration/views.py:132
msgid "Email validation email sent"
msgstr "L'email de vérification de l'adresse email a bien été envoyé."
-#: apps/registration/views.py:184
+#: apps/registration/views.py:185
msgid "Unregistered users"
msgstr "Utilisateurs en attente d'inscription"
-#: apps/registration/views.py:251
+#: apps/registration/views.py:252
msgid "You must join the BDE."
msgstr "Vous devez adhérer au BDE."
-#: apps/registration/views.py:273
+#: apps/registration/views.py:274
msgid "You must join BDE club before joining Kfet club."
msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet."
-#: apps/registration/views.py:278
+#: apps/registration/views.py:279
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
@@ -1168,11 +1168,11 @@ msgstr "Créer un club"
msgid "club listing "
msgstr "Liste des clubs"
-#: templates/member/club_tables.html:9
+#: templates/member/club_tables.html:6
msgid "Member of the Club"
msgstr "Membre du club"
-#: templates/member/club_tables.html:22 templates/member/profile_tables.html:31
+#: templates/member/club_tables.html:17 templates/member/profile_tables.html:28
msgid "Transaction history"
msgstr "Historique des transactions"
@@ -1226,7 +1226,7 @@ msgstr "Cet utilisateur n'a pas encore confirmé son adresse e-mail."
msgid "Click here to resend a validation link."
msgstr "Cliquez ici pour renvoyer un lien de validation."
-#: templates/member/profile_tables.html:18
+#: templates/member/profile_tables.html:15
msgid "View my memberships"
msgstr "Voir mes adhésions"
@@ -1321,18 +1321,28 @@ msgstr "Le bouton a bien été supprimé"
msgid "Unable to delete button "
msgstr "Impossible de supprimer le bouton "
+#: templates/registration/email_validation_complete.html:6
+msgid "Your email have successfully been validated."
+msgstr "Votre adresse e-mail a bien été validée."
+
#: templates/registration/email_validation_complete.html:8
#, python-format
+msgid "You can now <a href=\"%(login_url)s\">log in</a>."
+msgstr "Vous pouvez désormais <a href=\"%(login_url)s\">vous connecter</a>."
+
+#: templates/registration/email_validation_complete.html:10
msgid ""
-"Your account have successfully been activated. You can now <a href="
-"\"%(login_url)s\">log in</a>."
+"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."
-#: templates/registration/email_validation_complete.html:12
+#: templates/registration/email_validation_complete.html:13
msgid ""
"The link was invalid. The token may have expired. Please send us an email to "
"activate your account."
msgstr ""
+"Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter pour "
+"activer votre compte."
#: templates/registration/future_profile_detail.html:56
msgid "Delete registration"
@@ -1383,9 +1393,41 @@ msgstr ""
msgid "Forgotten your password or username?"
msgstr ""
+#: templates/registration/mails/email_validation_email.html:3
+msgid "Hi"
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html:5
+msgid ""
+"You recently registered on the Note Kfet. Please click on the link below to "
+"confirm your registration."
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html:9
+msgid ""
+"This link is only valid for a couple of days, after that you will need to "
+"contact us to validate your email."
+msgstr ""
+
+#: templates/registration/mails/email_validation_email.html: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."
+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."
+
+#: templates/registration/mails/email_validation_email.html:13
+msgid "Thanks"
+msgstr "Merci"
+
+#: templates/registration/mails/email_validation_email.html:15
+msgid "The Note Kfet team."
+msgstr "L'équipe de la Note Kfet."
+
#: templates/registration/password_change_done.html:8
msgid "Your password was changed."
-msgstr ""
+msgstr "Votre mot de passe a bien été changé."
#: templates/registration/password_change_form.html:9
msgid ""
diff --git a/templates/registration/email_validation_complete.html b/templates/registration/email_validation_complete.html
index 185fbfb0..4835cfa1 100644
--- a/templates/registration/email_validation_complete.html
+++ b/templates/registration/email_validation_complete.html
@@ -2,15 +2,14 @@
{% load i18n %}
{% block content %}
-<h2>{% trans Activation %}</h2>
-
-{% if validlink %}
-{% blocktrans trimmed %}
-Your account have successfully been activated. You can now <a href="{{ login_url }}">log in</a>.
-{% endblocktrans %}
-{% else %}
-{% blocktrans trimmed %}
-The link was invalid. The token may have expired. Please send us an email to activate your account.
-{% endblocktrans %}
-{% endif %}
+ {% if validlink %}
+ {% trans "Your email have successfully been validated." %}
+ {% if user.profile.registration_valid %}
+ {% blocktrans %}You can now <a href="{{ login_url }}">log in</a>.{% endblocktrans %}
+ {% else %}
+ {% trans "You must pay now your membership in the Kfet to complete your registration." %}
+ {% endif %}
+ {% else %}
+ {% trans "The link was invalid. The token may have expired. Please send us an email to activate your account." %}
+ {% endif %}
{% endblock %}
diff --git a/templates/registration/email_validation_email.html b/templates/registration/email_validation_email.html
deleted file mode 100644
index feb46876..00000000
--- a/templates/registration/email_validation_email.html
+++ /dev/null
@@ -1,11 +0,0 @@
-Hi {{ user.username }},
-
-Welcome to {{ site_name }}. Please click on the link below to confirm your registration.
-
-{{ protocol }}://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}
-
-This link is only valid for a couple of days, after that you will need to contact us to validate your email.
-
-Thanks,
-
-{{ site_name }} team.
diff --git a/templates/registration/mails/email_validation_email.html b/templates/registration/mails/email_validation_email.html
new file mode 100644
index 00000000..577c1220
--- /dev/null
+++ b/templates/registration/mails/email_validation_email.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+
+{% trans "Hi" %} {{ user.username }},
+
+{% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %}
+
+https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}
+
+{% 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." %}
+
+{% trans "Thanks" %},
+
+{% trans "The Note Kfet team." %}
--
GitLab