ynerant/plateforme-corres2math
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme-corres2math.git synced 2024-12-05 02:06:52 +00:00
Code Issues Releases Wiki Activity

Update email validation page

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-12-11 16:10:05 +01:00
parent 3faf1294d8
commit f2ca4b7446
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File 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> </p>
{% else %} {% else %}
<p> <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> </p>
{% endif %} {% endif %}
</div> </div>

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

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Corres2math\n" "Project-Id-Version: Corres2math\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Yohann D'ANELLO <yohann.danello@animath.fr>\n" "Last-Translator: Yohann D'ANELLO <yohann.danello@animath.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\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>." 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>." 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 "" 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, or your account is already "
"activate your account." "activated. However, your account seems to be already valid."
msgstr "" msgstr ""
"Le lien est invalide. Le jeton a peut-être expiré. Merci de nous envoyer un " "Le lien est invalide. Le jeton a peut-être expiré, ou votre compte est déjà "
"mail pour activer votre compte." "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 #: apps/registration/templates/registration/email_validation_email_sent.html:10
msgid "Account activation" msgid "Account activation"