ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Update mail translation

This commit is contained in:
Yohann D'ANELLO 2020-04-09 22:03:26 +02:00
parent e067b19d41
commit fc511689b0
7 changed files with 228 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/member/models.py
View File

@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
import datetime import datetime
import os
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
@ -79,12 +80,10 @@ class Profile(models.Model):
def send_email_validation_link(self): def send_email_validation_link(self):
subject = "Activate your Note Kfet account" 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, 'user': self.user,
'domain': "nk20.ynerant.fr", 'domain': os.getenv("NOTE_URL", "note.example.com"),
'site_name': "La Note Kfet",
'protocol': 'https',
'token': email_validation_token.make_token(self.user), 'token': email_validation_token.make_token(self.user),
'uid': urlsafe_base64_encode(force_bytes(self.user.pk)).decode('UTF-8'), 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)).decode('UTF-8'),
}) })

1
apps/registration/views.py
View File

@ -112,6 +112,7 @@ class UserValidateView(TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['user'] = self.get_user(self.kwargs["uidb64"])
context['login_url'] = resolve_url(settings.LOGIN_URL) context['login_url'] = resolve_url(settings.LOGIN_URL)
if self.validlink: if self.validlink:
context['validlink'] = True context['validlink'] = True

157
locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 "" msgstr ""
#: apps/activity/models.py:23 apps/activity/models.py:48 #: 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/notes.py:188 apps/note/models/transactions.py:24
#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237
#: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
@ -79,7 +79,7 @@ msgstr ""
msgid "type" msgid "type"
msgstr "" 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 #: apps/note/models/notes.py:117
msgid "user" msgid "user"
msgstr "" msgstr ""
@ -300,152 +300,152 @@ msgstr ""
msgid "Bank" msgid "Bank"
msgstr "" msgstr ""
#: apps/member/models.py:32 #: apps/member/models.py:33
#: templates/registration/future_profile_detail.html:47 #: templates/registration/future_profile_detail.html:47
msgid "phone number" msgid "phone number"
msgstr "" 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 #: templates/registration/future_profile_detail.html:41
msgid "section" msgid "section"
msgstr "" msgstr ""
#: apps/member/models.py:39 #: apps/member/models.py:40
msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
msgstr "" 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 #: templates/registration/future_profile_detail.html:44
msgid "address" msgid "address"
msgstr "" msgstr ""
#: apps/member/models.py:51 #: apps/member/models.py:52
#: templates/registration/future_profile_detail.html:50 #: templates/registration/future_profile_detail.html:50
msgid "paid" msgid "paid"
msgstr "" msgstr ""
#: apps/member/models.py:52 #: apps/member/models.py:53
msgid "Tells if the user receive a salary." msgid "Tells if the user receive a salary."
msgstr "" msgstr ""
#: apps/member/models.py:57 #: apps/member/models.py:58
msgid "email confirmed" msgid "email confirmed"
msgstr "" msgstr ""
#: apps/member/models.py:62 #: apps/member/models.py:63
msgid "registration valid" msgid "registration valid"
msgstr "" msgstr ""
#: apps/member/models.py:67 #: apps/member/models.py:68
msgid "Société générale" msgid "Société générale"
msgstr "" 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?" msgid "Has the user ever be paid by the Société générale?"
msgstr "" msgstr ""
#: apps/member/models.py:73 apps/member/models.py:74 #: apps/member/models.py:74 apps/member/models.py:75
msgid "user profile" msgid "user profile"
msgstr "" 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 #: templates/registration/future_profile_detail.html:22
msgid "email" msgid "email"
msgstr "" msgstr ""
#: apps/member/models.py:112 #: apps/member/models.py:111
msgid "parent club" msgid "parent club"
msgstr "" msgstr ""
#: apps/member/models.py:121 #: apps/member/models.py:120
msgid "require memberships" msgid "require memberships"
msgstr "" msgstr ""
#: apps/member/models.py:122 #: apps/member/models.py:121
msgid "Uncheck if this club don't require memberships." msgid "Uncheck if this club don't require memberships."
msgstr "" 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)" msgid "membership fee (paid students)"
msgstr "" 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)" msgid "membership fee (unpaid students)"
msgstr "" 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" msgid "membership duration"
msgstr "" msgstr ""
#: apps/member/models.py:139 #: apps/member/models.py:138
msgid "The longest time (in days) a membership can last (NULL = infinite)." msgid "The longest time (in days) a membership can last (NULL = infinite)."
msgstr "" 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" msgid "membership start"
msgstr "" msgstr ""
#: apps/member/models.py:147 #: apps/member/models.py:146
msgid "How long after January 1st the members can renew their membership." msgid "How long after January 1st the members can renew their membership."
msgstr "" 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" msgid "membership end"
msgstr "" msgstr ""
#: apps/member/models.py:155 #: apps/member/models.py:154
msgid "" msgid ""
"How long the membership can last after January 1st of the next year after " "How long the membership can last after January 1st of the next year after "
"members can renew their membership." "members can renew their membership."
msgstr "" 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 #: apps/note/models/notes.py:139
msgid "club" msgid "club"
msgstr "" msgstr ""
#: apps/member/models.py:189 #: apps/member/models.py:188
msgid "clubs" msgid "clubs"
msgstr "" msgstr ""
#: apps/member/models.py:209 apps/permission/models.py:294 #: apps/member/models.py:208 apps/permission/models.py:294
msgid "role" msgid "role"
msgstr "" msgstr ""
#: apps/member/models.py:210 apps/member/models.py:235 #: apps/member/models.py:209 apps/member/models.py:234
msgid "roles" msgid "roles"
msgstr "" msgstr ""
#: apps/member/models.py:240 #: apps/member/models.py:239
msgid "membership starts on" msgid "membership starts on"
msgstr "" msgstr ""
#: apps/member/models.py:244 #: apps/member/models.py:243
msgid "membership ends on" msgid "membership ends on"
msgstr "" msgstr ""
#: apps/member/models.py:249 #: apps/member/models.py:248
msgid "fee" msgid "fee"
msgstr "" 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" msgid "User is not a member of the parent club"
msgstr "" 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" msgid "User is already a member of the club"
msgstr "" msgstr ""
#: apps/member/models.py:315 #: apps/member/models.py:314
#, python-brace-format #, python-brace-format
msgid "Membership of {user} for the club {club}" msgid "Membership of {user} for the club {club}"
msgstr "" msgstr ""
#: apps/member/models.py:318 #: apps/member/models.py:317
msgid "membership" msgid "membership"
msgstr "" msgstr ""
#: apps/member/models.py:319 #: apps/member/models.py:318
msgid "memberships" msgid "memberships"
msgstr "" msgstr ""
@ -466,27 +466,27 @@ msgstr ""
msgid "An alias with a similar name already exists." msgid "An alias with a similar name already exists."
msgstr "" msgstr ""
#: apps/member/views.py:175 #: apps/member/views.py:180
msgid "Search user" msgid "Search user"
msgstr "" msgstr ""
#: apps/member/views.py:486 #: apps/member/views.py:495
msgid "" msgid ""
"This user don't have enough money to join this club, and can't have a " "This user don't have enough money to join this club, and can't have a "
"negative balance." "negative balance."
msgstr "" msgstr ""
#: apps/member/views.py:504 #: apps/member/views.py:513
msgid "The membership must start after {:%m-%d-%Y}." msgid "The membership must start after {:%m-%d-%Y}."
msgstr "" msgstr ""
#: apps/member/views.py:509 #: apps/member/views.py:518
msgid "The membership must begin before {:%m-%d-%Y}." msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "" msgstr ""
#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523 #: apps/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532
#: apps/registration/views.py:285 apps/registration/views.py:287 #: apps/registration/views.py:286 apps/registration/views.py:288
#: apps/registration/views.py:289 #: apps/registration/views.py:290
msgid "This field is required." msgid "This field is required."
msgstr "" msgstr ""
@ -785,27 +785,27 @@ msgstr ""
msgid "Email validation" msgid "Email validation"
msgstr "" msgstr ""
#: apps/registration/views.py:120 #: apps/registration/views.py:121
msgid "Email validation unsuccessful" msgid "Email validation unsuccessful"
msgstr "" msgstr ""
#: apps/registration/views.py:131 #: apps/registration/views.py:132
msgid "Email validation email sent" msgid "Email validation email sent"
msgstr "" msgstr ""
#: apps/registration/views.py:184 #: apps/registration/views.py:185
msgid "Unregistered users" msgid "Unregistered users"
msgstr "" msgstr ""
#: apps/registration/views.py:251 #: apps/registration/views.py:252
msgid "You must join the BDE." msgid "You must join the BDE."
msgstr "" msgstr ""
#: apps/registration/views.py:273 #: apps/registration/views.py:274
msgid "You must join BDE club before joining Kfet club." msgid "You must join BDE club before joining Kfet club."
msgstr "" msgstr ""
#: apps/registration/views.py:278 #: apps/registration/views.py:279
msgid "" msgid ""
"The entered amount is not enough for the memberships, should be at least {}" "The entered amount is not enough for the memberships, should be at least {}"
msgstr "" msgstr ""
@ -1161,11 +1161,11 @@ msgstr ""
msgid "club listing " msgid "club listing "
msgstr "" msgstr ""
#: templates/member/club_tables.html:9 #: templates/member/club_tables.html:6
msgid "Member of the Club" msgid "Member of the Club"
msgstr "" 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" msgid "Transaction history"
msgstr "" msgstr ""
@ -1219,7 +1219,7 @@ msgstr ""
msgid "Click here to resend a validation link." msgid "Click here to resend a validation link."
msgstr "" msgstr ""
#: templates/member/profile_tables.html:18 #: templates/member/profile_tables.html:15
msgid "View my memberships" msgid "View my memberships"
msgstr "" msgstr ""
@ -1314,14 +1314,21 @@ msgstr ""
msgid "Unable to delete button " msgid "Unable to delete button "
msgstr "" msgstr ""
#: templates/registration/email_validation_complete.html:8 #: templates/registration/email_validation_complete.html:6
#, python-format msgid "Your email have successfully been validated."
msgid ""
"Your account have successfully been activated. You can now <a href="
"\"%(login_url)s\">log in</a>."
msgstr "" msgstr ""
#: templates/registration/email_validation_complete.html:12 #: 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 ""
"You must pay now your membership in the Kfet to complete your registration."
msgstr ""
#: templates/registration/email_validation_complete.html:13
msgid "" msgid ""
"The link was invalid. The token may have expired. Please send us an email to " "The link was invalid. The token may have expired. Please send us an email to "
"activate your account." "activate your account."
@ -1376,6 +1383,36 @@ msgstr ""
msgid "Forgotten your password or username?" msgid "Forgotten your password or username?"
msgstr "" 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 #: templates/registration/password_change_done.html:8
msgid "Your password was changed." msgid "Your password was changed."
msgstr "" msgstr ""

162
locale/fr/LC_MESSAGES/django.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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é." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
#: apps/activity/models.py:23 apps/activity/models.py:48 #: 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/notes.py:188 apps/note/models/transactions.py:24
#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237
#: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
@ -75,7 +75,7 @@ msgstr "description"
msgid "type" msgid "type"
msgstr "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 #: apps/note/models/notes.py:117
msgid "user" msgid "user"
msgstr "utilisateur" msgstr "utilisateur"
@ -296,102 +296,102 @@ msgstr "Montant à créditer"
msgid "Bank" msgid "Bank"
msgstr "Banque" msgstr "Banque"
#: apps/member/models.py:32 #: apps/member/models.py:33
#: templates/registration/future_profile_detail.html:47 #: templates/registration/future_profile_detail.html:47
msgid "phone number" msgid "phone number"
msgstr "numéro de téléphone" 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 #: templates/registration/future_profile_detail.html:41
msgid "section" msgid "section"
msgstr "section" msgstr "section"
#: apps/member/models.py:39 #: apps/member/models.py:40
msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
msgstr "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 #: templates/registration/future_profile_detail.html:44
msgid "address" msgid "address"
msgstr "adresse" msgstr "adresse"
#: apps/member/models.py:51 #: apps/member/models.py:52
#: templates/registration/future_profile_detail.html:50 #: templates/registration/future_profile_detail.html:50
msgid "paid" msgid "paid"
msgstr "payé" msgstr "payé"
#: apps/member/models.py:52 #: apps/member/models.py:53
msgid "Tells if the user receive a salary." msgid "Tells if the user receive a salary."
msgstr "Indique si l'utilisateur perçoit un salaire." msgstr "Indique si l'utilisateur perçoit un salaire."
#: apps/member/models.py:57 #: apps/member/models.py:58
msgid "email confirmed" msgid "email confirmed"
msgstr "adresse email confirmée" msgstr "adresse email confirmée"
#: apps/member/models.py:62 #: apps/member/models.py:63
msgid "registration valid" msgid "registration valid"
msgstr "inscription valid" msgstr "inscription valid"
#: apps/member/models.py:67 #: apps/member/models.py:68
msgid "Société générale" msgid "Société générale"
msgstr "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?" 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 ?" 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" msgid "user profile"
msgstr "profil utilisateur" 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 #: templates/registration/future_profile_detail.html:22
msgid "email" msgid "email"
msgstr "courriel" msgstr "courriel"
#: apps/member/models.py:112 #: apps/member/models.py:111
msgid "parent club" msgid "parent club"
msgstr "club parent" msgstr "club parent"
#: apps/member/models.py:121 #: apps/member/models.py:120
msgid "require memberships" msgid "require memberships"
msgstr "nécessite des adhésions" 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." msgid "Uncheck if this club don't require memberships."
msgstr "Décochez si ce club n'utilise pas d'adhésions." 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)" msgid "membership fee (paid students)"
msgstr "cotisation pour adhérer (normalien élève)" 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)" msgid "membership fee (unpaid students)"
msgstr "cotisation pour adhérer (normalien étudiant)" 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" msgid "membership duration"
msgstr "durée de l'adhésion" 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)." 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)." 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" msgid "membership start"
msgstr "début de l'adhésion" 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." msgid "How long after January 1st the members can renew their membership."
msgstr "" msgstr ""
"Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur "
"adhésion." "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" msgid "membership end"
msgstr "fin de l'adhésion" msgstr "fin de l'adhésion"
#: apps/member/models.py:155 #: apps/member/models.py:154
msgid "" msgid ""
"How long the membership can last after January 1st of the next year after " "How long the membership can last after January 1st of the next year after "
"members can renew their membership." "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 " "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." "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 #: apps/note/models/notes.py:139
msgid "club" msgid "club"
msgstr "club" msgstr "club"
#: apps/member/models.py:189 #: apps/member/models.py:188
msgid "clubs" msgid "clubs"
msgstr "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" msgid "role"
msgstr "rôle" 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" msgid "roles"
msgstr "rôles" msgstr "rôles"
#: apps/member/models.py:240 #: apps/member/models.py:239
msgid "membership starts on" msgid "membership starts on"
msgstr "l'adhésion commence le" msgstr "l'adhésion commence le"
#: apps/member/models.py:244 #: apps/member/models.py:243
msgid "membership ends on" msgid "membership ends on"
msgstr "l'adhésion finit le" msgstr "l'adhésion finit le"
#: apps/member/models.py:249 #: apps/member/models.py:248
msgid "fee" msgid "fee"
msgstr "cotisation" 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" msgid "User is not a member of the parent club"
msgstr "L'utilisateur n'est pas membre du club parent" 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" msgid "User is already a member of the club"
msgstr "L'utilisateur est déjà membre du club" msgstr "L'utilisateur est déjà membre du club"
#: apps/member/models.py:315 #: apps/member/models.py:314
#, python-brace-format #, python-brace-format
msgid "Membership of {user} for the club {club}" msgid "Membership of {user} for the club {club}"
msgstr "Adhésion de {user} pour le club {club}" msgstr "Adhésion de {user} pour le club {club}"
#: apps/member/models.py:318 #: apps/member/models.py:317
msgid "membership" msgid "membership"
msgstr "adhésion" msgstr "adhésion"
#: apps/member/models.py:319 #: apps/member/models.py:318
msgid "memberships" msgid "memberships"
msgstr "adhésions" msgstr "adhésions"
@ -466,11 +466,11 @@ msgstr "Modifier le profil"
msgid "An alias with a similar name already exists." msgid "An alias with a similar name already exists."
msgstr "Un alias avec un nom similaire existe déjà." msgstr "Un alias avec un nom similaire existe déjà."
#: apps/member/views.py:175 #: apps/member/views.py:180
msgid "Search user" msgid "Search user"
msgstr "Chercher un utilisateur" msgstr "Chercher un utilisateur"
#: apps/member/views.py:486 #: apps/member/views.py:495
msgid "" msgid ""
"This user don't have enough money to join this club, and can't have a " "This user don't have enough money to join this club, and can't have a "
"negative balance." "negative balance."
@ -478,17 +478,17 @@ msgstr ""
"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas " "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
"avoir un solde négatif." "avoir un solde négatif."
#: apps/member/views.py:504 #: apps/member/views.py:513
msgid "The membership must start after {:%m-%d-%Y}." msgid "The membership must start after {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer après le {:%d/%m/%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}." msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer avant le {:%d/%m/%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/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532
#: apps/registration/views.py:285 apps/registration/views.py:287 #: apps/registration/views.py:286 apps/registration/views.py:288
#: apps/registration/views.py:289 #: apps/registration/views.py:290
msgid "This field is required." msgid "This field is required."
msgstr "Ce champ est requis." msgstr "Ce champ est requis."
@ -788,27 +788,27 @@ msgstr "Adhérer au club Kfet"
msgid "Email validation" msgid "Email validation"
msgstr "Validation de l'adresse mail" msgstr "Validation de l'adresse mail"
#: apps/registration/views.py:120 #: apps/registration/views.py:121
msgid "Email validation unsuccessful" msgid "Email validation unsuccessful"
msgstr " La validation de l'adresse mail a échoué" msgstr " La validation de l'adresse mail a échoué"
#: apps/registration/views.py:131 #: apps/registration/views.py:132
msgid "Email validation email sent" msgid "Email validation email sent"
msgstr "L'email de vérification de l'adresse email a bien été envoyé." 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" msgid "Unregistered users"
msgstr "Utilisateurs en attente d'inscription" msgstr "Utilisateurs en attente d'inscription"
#: apps/registration/views.py:251 #: apps/registration/views.py:252
msgid "You must join the BDE." msgid "You must join the BDE."
msgstr "Vous devez adhérer au 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." 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." 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 "" msgid ""
"The entered amount is not enough for the memberships, should be at least {}" "The entered amount is not enough for the memberships, should be at least {}"
msgstr "" msgstr ""
@ -1168,11 +1168,11 @@ msgstr "Créer un club"
msgid "club listing " msgid "club listing "
msgstr "Liste des clubs" msgstr "Liste des clubs"
#: templates/member/club_tables.html:9 #: templates/member/club_tables.html:6
msgid "Member of the Club" msgid "Member of the Club"
msgstr "Membre du 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" msgid "Transaction history"
msgstr "Historique des transactions" 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." msgid "Click here to resend a validation link."
msgstr "Cliquez ici pour renvoyer un lien de validation." 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" msgid "View my memberships"
msgstr "Voir mes adhésions" msgstr "Voir mes adhésions"
@ -1321,18 +1321,28 @@ msgstr "Le bouton a bien été supprimé"
msgid "Unable to delete button " msgid "Unable to delete button "
msgstr "Impossible de supprimer le bouton " 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 #: templates/registration/email_validation_complete.html:8
#, python-format #, python-format
msgid "" msgid "You can now <a href=\"%(login_url)s\">log in</a>."
"Your account have successfully been activated. You can now <a href=" msgstr "Vous pouvez désormais <a href=\"%(login_url)s\">vous connecter</a>."
"\"%(login_url)s\">log in</a>."
msgstr ""
#: templates/registration/email_validation_complete.html:12 #: templates/registration/email_validation_complete.html:10
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."
#: templates/registration/email_validation_complete.html:13
msgid "" msgid ""
"The link was invalid. The token may have expired. Please send us an email to " "The link was invalid. The token may have expired. Please send us an email to "
"activate your account." "activate your account."
msgstr "" 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 #: templates/registration/future_profile_detail.html:56
msgid "Delete registration" msgid "Delete registration"
@ -1383,9 +1393,41 @@ msgstr ""
msgid "Forgotten your password or username?" msgid "Forgotten your password or username?"
msgstr "" 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 #: templates/registration/password_change_done.html:8
msgid "Your password was changed." msgid "Your password was changed."
msgstr "" msgstr "Votre mot de passe a bien été changé."
#: templates/registration/password_change_form.html:9 #: templates/registration/password_change_form.html:9
msgid "" msgid ""

21
templates/registration/email_validation_complete.html
View File

@ -2,15 +2,14 @@
{% load i18n %} {% load i18n %}
{% block content %} {% block content %}
<h2>{% trans Activation %}</h2> {% if validlink %}
{% trans "Your email have successfully been validated." %}
{% if validlink %} {% if user.profile.registration_valid %}
{% blocktrans trimmed %} {% blocktrans %}You can now <a href="{{ login_url }}">log in</a>.{% endblocktrans %}
Your account have successfully been activated. You can now <a href="{{ login_url }}">log in</a>. {% else %}
{% endblocktrans %} {% trans "You must pay now your membership in the Kfet to complete your registration." %}
{% else %} {% endif %}
{% blocktrans trimmed %} {% else %}
The link was invalid. The token may have expired. Please send us an email to activate your account. {% trans "The link was invalid. The token may have expired. Please send us an email to activate your account." %}
{% endblocktrans %} {% endif %}
{% endif %}
{% endblock %} {% endblock %}

11
templates/registration/email_validation_email.html
View File

@ -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.

15
templates/registration/mails/email_validation_email.html Normal file
View File

@ -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." %}