From 2c02951a0dfa458a1f40336f288af60e89693151 Mon Sep 17 00:00:00 2001
From: Emmy D'Anello <emmy.danello@animath.fr>
Date: Thu, 18 Jan 2024 19:53:12 +0100
Subject: [PATCH] Remind that the username is the email address

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
---
 locale/fr/LC_MESSAGES/django.po               | 25 +++++++++++++------
 .../mails/email_validation_email.html         |  4 +++
 .../mails/email_validation_email.txt          |  2 ++
 tfjm/templates/registration/login.html        |  9 +++++--
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 1c61956..8fa9347 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TFJM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-16 22:28+0100\n"
+"POT-Creation-Date: 2024-01-18 19:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emmy D'Anello <emmy.danello@animath.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1944,8 +1944,8 @@ msgstr ""
 
 #: registration/templates/registration/mails/add_organizer.html:37
 #: registration/templates/registration/mails/add_organizer.txt:17
-#: registration/templates/registration/mails/email_validation_email.html:35
-#: registration/templates/registration/mails/email_validation_email.txt:13
+#: registration/templates/registration/mails/email_validation_email.html:39
+#: registration/templates/registration/mails/email_validation_email.txt:15
 msgid "The TFJM² team."
 msgstr "L'équipe du TFJM²"
 
@@ -1974,6 +1974,11 @@ msgstr ""
 
 #: registration/templates/registration/mails/email_validation_email.html:30
 #: registration/templates/registration/mails/email_validation_email.txt:11
+msgid "As a reminder, your username is your email address:"
+msgstr "Pour rappel, vous nom d'utilisateur⋅rice est votre adresse email :"
+
+#: registration/templates/registration/mails/email_validation_email.html:34
+#: registration/templates/registration/mails/email_validation_email.txt:13
 msgid "Thanks"
 msgstr "Merci"
 
@@ -2003,7 +2008,7 @@ msgstr "Votre mot de passe a été changé. Vous pouvez désormais vous connecte
 #: tfjm/templates/base.html:136 tfjm/templates/base.html:262
 #: tfjm/templates/base.html:263 tfjm/templates/registration/login.html:7
 #: tfjm/templates/registration/login.html:8
-#: tfjm/templates/registration/login.html:25
+#: tfjm/templates/registration/login.html:30
 msgid "Log in"
 msgstr "Connexion"
 
@@ -2339,11 +2344,11 @@ msgstr "Autorisation parentale de {student}.{ext}"
 msgid "Scholarship attestation of {user}.{ext}"
 msgstr "Notification de bourse de {user}.{ext}"
 
-#: tfjm/settings.py:167
+#: tfjm/settings.py:164
 msgid "English"
 msgstr "Anglais"
 
-#: tfjm/settings.py:168
+#: tfjm/settings.py:165
 msgid "French"
 msgstr "Français"
 
@@ -2488,8 +2493,12 @@ msgstr ""
 "Vous êtes connecté⋅e en tant que %(user)s, mais n'êtes pas autorisé⋅e à "
 "accéder à cette page. Voulez-vous vous reconnecter avec un autre compte ?"
 
-#: tfjm/templates/registration/login.html:23
-msgid "Forgotten your password or username?"
+#: tfjm/templates/registration/login.html:25
+msgid "Your username is your e-mail address."
+msgstr "Votre identifiant est votre adresse e-mail."
+
+#: tfjm/templates/registration/login.html:28
+msgid "Forgotten your password?"
 msgstr "Mot de passe oublié ?"
 
 #: tfjm/templates/search/search.html:6 tfjm/templates/search/search.html:10
diff --git a/registration/templates/registration/mails/email_validation_email.html b/registration/templates/registration/mails/email_validation_email.html
index 34ce507..9df42b3 100644
--- a/registration/templates/registration/mails/email_validation_email.html
+++ b/registration/templates/registration/mails/email_validation_email.html
@@ -26,6 +26,10 @@
     {% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %}
 </p>
 
+<p>
+    {% trans "As a reminder, your username is your email address:" %} {{ user.email }}.
+</p>
+
 <p>
     {% trans "Thanks" %},
 </p>
diff --git a/registration/templates/registration/mails/email_validation_email.txt b/registration/templates/registration/mails/email_validation_email.txt
index f70e1bb..8a3a31e 100644
--- a/registration/templates/registration/mails/email_validation_email.txt
+++ b/registration/templates/registration/mails/email_validation_email.txt
@@ -8,6 +8,8 @@ https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=toke
 
 {% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %}
 
+{% trans "As a reminder, your username is your email address:" %} {{ user.email }}
+
 {% trans "Thanks" %},
 
 {% trans "The TFJM² team." %}
diff --git a/tfjm/templates/registration/login.html b/tfjm/templates/registration/login.html
index 766a062..09c4703 100644
--- a/tfjm/templates/registration/login.html
+++ b/tfjm/templates/registration/login.html
@@ -18,9 +18,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
     {% endif %}
     <form method="post" id="login-form">
         <div id="form-content">
+            {{ form|as_crispy_errors }}
             {% csrf_token %}
-            {{ form | crispy }}
-            <a href="{% url 'password_reset' %}" class="badge text-bg-warning">{% trans 'Forgotten your password or username?' %}</a>
+            {{ form.username|as_crispy_field }}
+            <div class="form-text mb-3">
+                <i class="fas fa-info-circle"></i> {% trans "Your username is your e-mail address." %}
+            </div>
+            {{ form.password|as_crispy_field }}
+            <a href="{% url 'password_reset' %}" class="badge text-bg-warning">{% trans 'Forgotten your password?' %}</a>
         </div>
         <input type="submit" value="{% trans 'Log in' %}" class="btn btn-primary">
     </form>