From f72ae0326ad0edd1b824adfc896187d5bf75e691 Mon Sep 17 00:00:00 2001
From: Emmanuel Cazenave <ecazenave@entrouvert.com>
Date: Mon, 7 May 2018 15:39:36 +0200
Subject: [PATCH] change account wording (#22225)

---
 src/authentic2/locale/fr/LC_MESSAGES/django.po    | 15 +++++++++------
 .../registration/password_change_form.html        |  4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/authentic2/locale/fr/LC_MESSAGES/django.po b/src/authentic2/locale/fr/LC_MESSAGES/django.po
index e39ea7ee..c709b75a 100644
--- a/src/authentic2/locale/fr/LC_MESSAGES/django.po
+++ b/src/authentic2/locale/fr/LC_MESSAGES/django.po
@@ -677,7 +677,7 @@ msgstr "Vous venez de créer un compte."
 
 #: registration_backend/views.py:369 templates/authentic2/accounts.html:41
 msgid "Delete account"
-msgstr "Supprimer votre compte"
+msgstr "Supprimer mon compte"
 
 #: registration_backend/views.py:400
 msgid ""
@@ -727,11 +727,11 @@ msgstr "Page de logs"
 
 #: templates/authentic2/accounts.html:35
 msgid "Change email"
-msgstr "Modifier votre adresse électronique"
+msgstr "Modifier mon adresse de courriel"
 
 #: templates/authentic2/accounts.html:38 views.py:71
 msgid "Edit account data"
-msgstr "Éditer les données du compte"
+msgstr "Éditer mon profil"
 
 #: templates/authentic2/accounts.html:45
 msgid "Credentials"
@@ -1255,10 +1255,13 @@ msgid ""
 "    the new password and confirm it.\n"
 "    "
 msgstr ""
-"Pour modifier votre mot de passe vous devez fournir votre mot de passe "
-"actuel ainsi que le nouveau, puis confirmer ce dernier."
+"Vous allez modifier le mot de passe de votre compte usager."
 
-#: templates/registration/password_reset_confirm.html:21
+#: src/authentic2/templates/registration/password_change_form.html:21
+msgid "You are going to define your account password"
+msgstr "Vous allez définir le mot de passe de votre compte usager."
+
+#: src/authentic2/templates/registration/password_reset_confirm.html:21
 msgid "Password reset failed"
 msgstr "Ré-initialistion du mot de passe échouée"
 
diff --git a/src/authentic2/templates/registration/password_change_form.html b/src/authentic2/templates/registration/password_change_form.html
index 0093e2ad..80411b7d 100644
--- a/src/authentic2/templates/registration/password_change_form.html
+++ b/src/authentic2/templates/registration/password_change_form.html
@@ -13,9 +13,13 @@
 
 {% block content %}
   <form method="post" action=".">
+    {% if user.has_usable_password %}
     <p>{% blocktrans %}To change your password you must provide your current password, then provide
     the new password and confirm it.
     {% endblocktrans %}</p>
+    {% else %}
+    <p>{% blocktrans %}You are going to define your account password{% endblocktrans %}</p>
+    {% endif %}
     {% csrf_token %}
     {{ form.as_p }}
     <button class="submit-button">{% trans 'Submit' %}</button>
-- 
2.17.0