ynerant/plateforme-corres2math
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme-corres2math.git synced 2025-02-12 13:01:17 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:dbcf15c4f3159004879dc47e1966f0dcfba1629b
Branches Tags
ynerant:master
ynerant:improvements
...
compare: ynerant:f2ca4b74469b8507b1bf32bcde523748a46327a5
Branches Tags
ynerant:master
ynerant:improvements

2 Commits
dbcf15c4f3 ... f2ca4b7446

Author SHA1 Message Date
Yohann D'ANELLO
f2ca4b7446 Update email validation page 2020-12-11 16:10:05 +01:00
Yohann D'ANELLO
3faf1294d8 Update import order 2020-12-11 16:09:51 +01:00
3 changed files with 21 additions and 10 deletions
Show Stats Expand all files Collapse all files

6
apps/registration/templates/registration/email_validation_complete.html
View File

@ -19,7 +19,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
</p>
{% else %}
<p>
{% trans "The link was invalid. The token may have expired. Please send us an email to activate your account." %}
{% if user.is_authenticated and user.registration.email_confirmed %}
{% trans "The link was invalid. The token may have expired, or your account is already activated. However, your account seems to be already valid." %}
{% else %}
{% trans "The link was invalid. The token may have expired, or your account is already activated. Please send us an email to activate your account." %}
{% endif %}
</p>
{% endif %}
</div>

5
apps/registration/views.py
View File

@ -1,7 +1,5 @@
import os
from django_tables2 import SingleTableView
from corres2math.tokens import email_validation_token
from corres2math.views import AdminMixin
from django.conf import settings
@ -15,11 +13,12 @@ from django.urls import reverse_lazy
from django.utils.http import urlsafe_base64_decode
from django.utils.translation import gettext_lazy as _
from django.views.generic import CreateView, DetailView, RedirectView, TemplateView, UpdateView, View
from django_tables2 import SingleTableView
from magic import Magic
from participation.models import Phase
from .forms import CoachRegistrationForm, PhotoAuthorizationForm, SignupForm, StudentRegistrationForm, UserForm
from .models import StudentRegistration, Registration
from .models import Registration, StudentRegistration
from .tables import RegistrationTable

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

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Corres2math\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-12-11 14:03+0100\n"
"POT-Creation-Date: 2020-12-11 16:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Yohann D'ANELLO <yohann.danello@animath.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -891,13 +891,21 @@ msgstr "Votre email a été validé avec succès."
msgid "You can now <a href=\"%(login_url)s\">log in</a>."
msgstr "Vous pouvez désormais vous <a href=\"%(login_url)s\">connecter</a>."
#: apps/registration/templates/registration/email_validation_complete.html:22
#: apps/registration/templates/registration/email_validation_complete.html:23
msgid ""
"The link was invalid. The token may have expired. Please send us an email to "
"activate your account."
"The link was invalid. The token may have expired, or your account is already "
"activated. However, your account seems to be already valid."
msgstr ""
"Le lien est invalide. Le jeton a peut-être expiré. Merci de nous envoyer un "
"mail pour activer votre compte."
"Le lien est invalide. Le jeton a peut-être expiré, ou votre compte est déjà "
"activé. Toutefois, il semble que votre compte est déjà valide."
#: apps/registration/templates/registration/email_validation_complete.html:25
msgid ""
"The link was invalid. The token may have expired, or your account is already "
"activated. Please send us an email to activate your account."
msgstr ""
"Le lien est invalide. Le jeton a peut-être expiré, ou votre compte est déjà "
"activé. Merci de nous envoyer un mail pour activer votre compte."
#: apps/registration/templates/registration/email_validation_email_sent.html:10
msgid "Account activation"