diff --git a/apps/registration/templates/registration/user_detail.html b/apps/registration/templates/registration/user_detail.html index 06800af..fb4ee6b 100644 --- a/apps/registration/templates/registration/user_detail.html +++ b/apps/registration/templates/registration/user_detail.html @@ -7,35 +7,36 @@
-

{{ user.first_name }} {{ user.last_name }}

+

{{ user_object.first_name }} {{ user_object.last_name }}

{% trans "Last name:" %}
-
{{ user.last_name }}
+
{{ user_object.last_name }}
{% trans "First name:" %}
-
{{ user.first_name }}
+
{{ user_object.first_name }}
{% trans "Email:" %}
-
{{ user.email }}
+
{{ user_object.email }} + {% if not user_object.registration.email_confirmed %} ({% trans "Not confirmed" %}, {% trans "resend the validation link" %}){% endif %}
- {% if user.registration.studentregistration %} + {% if user_object.registration.studentregistration %}
{% trans "Student class:" %}
-
{{ user.registration.get_student_class_display }}
+
{{ user_object.registration.get_student_class_display }}
{% trans "School:" %}
-
{{ user.registration.school }}
- {% elif user.registration.coachregistration %} +
{{ user_object.registration.school }}
+ {% elif user_object.registration.coachregistration %}
{% trans "Profesional activity:" %}
-
{{ user.registration.professional_activity }}
- {% elif user.registration.adminregistration %} +
{{ user_object.registration.professional_activity }}
+ {% elif user_object.registration.adminregistration %}
{% trans "Role:" %}
-
{{ user.registration.role }}
+
{{ user_object.registration.role }}
{% endif %}
{% trans "Grant Animath to contact me in the future about other actions:" %}
-
{{ user.registration.give_contact_to_animath|yesno }}
+
{{ user_object.registration.give_contact_to_animath|yesno }}
@@ -52,7 +53,7 @@ $('button[data-target="#updateUserModal"]').click(function() { let modalBody = $("#updateUserModal div.modal-body"); if (!modalBody.html().trim()) - modalBody.load("{% url "registration:update_user" pk=user.pk %} #form-content"); + modalBody.load("{% url "registration:update_user" pk=user_object.pk %} #form-content"); }); }); diff --git a/apps/registration/views.py b/apps/registration/views.py index ef33d99..dc8ccd8 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -127,6 +127,7 @@ class MyAccountDetailView(LoginRequiredMixin, RedirectView): class UserDetailView(LoginRequiredMixin, DetailView): model = User + context_object_name = "user_object" template_name = "registration/user_detail.html" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index aa518b5..e007f19 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Corres2math\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-24 18:38+0200\n" +"POT-Creation-Date: 2020-09-24 18:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: LANGUAGE \n" @@ -274,7 +274,7 @@ msgstr "Autoriser Animath à publier notre vidéo :" #: apps/participation/templates/participation/update_team_modal.html:15 #: apps/registration/templates/registration/update_user.html:12 #: apps/registration/templates/registration/update_user_modal.html:15 -#: apps/registration/templates/registration/user_detail.html:42 +#: apps/registration/templates/registration/user_detail.html:43 msgid "Update" msgstr "Modifier" @@ -559,23 +559,31 @@ msgstr "Prénom :" msgid "Email:" msgstr "Adresse e-mail :" -#: apps/registration/templates/registration/user_detail.html:24 +#: apps/registration/templates/registration/user_detail.html:22 +msgid "Not confirmed" +msgstr "Non confirmée" + +#: apps/registration/templates/registration/user_detail.html:22 +msgid "resend the validation link" +msgstr "Renvoyer le lien de validation" + +#: apps/registration/templates/registration/user_detail.html:25 msgid "Student class:" msgstr "Classe :" -#: apps/registration/templates/registration/user_detail.html:27 +#: apps/registration/templates/registration/user_detail.html:28 msgid "School:" msgstr "École :" -#: apps/registration/templates/registration/user_detail.html:30 +#: apps/registration/templates/registration/user_detail.html:31 msgid "Profesional activity:" msgstr "Activité professionnelle :" -#: apps/registration/templates/registration/user_detail.html:33 +#: apps/registration/templates/registration/user_detail.html:34 msgid "Role:" msgstr "Rôle :" -#: apps/registration/templates/registration/user_detail.html:37 +#: apps/registration/templates/registration/user_detail.html:38 msgid "Grant Animath to contact me in the future about other actions:" msgstr "Autorise Animath à recontacter à propos d'autres actions :" @@ -692,7 +700,18 @@ msgstr "Mon compte" msgid "Log out" msgstr "Déconnexion" -#: templates/base.html:150 +#: templates/base.html:139 +#, python-format +msgid "" +"Your email address is not validated. Please click on the link you received " +"by email. You can resend a mail by clicking on this link." +msgstr "" +"Votre adresse mail n'est pas validée. Merci de cliquer sur le lien que vous " +"avez reçu par mail. Vous pouvez renvoyer un mail en cliquant sur ce lien." + +#: templates/base.html:162 msgid "Contact us" msgstr "Nous contacter" diff --git a/templates/base.html b/templates/base.html index 2289469..32fa084 100644 --- a/templates/base.html +++ b/templates/base.html @@ -130,6 +130,18 @@
{% block contenttitle %}{% endblock %} + {% if user.is_authenticated and not user.registration.email_confirmed %} +
+ + {% url "registration:email_validation_resend" pk=user.pk as send_email_url %} + {% blocktrans trimmed %} + Your email address is not validated. Please click on the link you received by email. + You can resend a mail by clicking on this link. + {% endblocktrans %} +
+ {% endif %}
{% block content %}