From 2955f16c56ab90bdd995cc9b0d0f713a6bf5021f Mon Sep 17 00:00:00 2001
From: Allister Banks <arubdesu@me.com>
Date: Thu, 24 Oct 2024 00:54:30 +0900
Subject: [PATCH] Rephrasing copy re: password resets

Tweaking expressions to be more in line with how other systems phrase things
---
 server/templates/registration/invitation_email.html      | 2 +-
 server/templates/registration/login.html                 | 2 +-
 server/templates/registration/password_reset_email.html  | 6 +++---
 server/templates/registration/password_reset_subject.txt | 2 +-
 tests/server_accounts/test_password_reset.py             | 4 ++--
 tests/server_accounts/test_users_views.py                | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/templates/registration/invitation_email.html b/server/templates/registration/invitation_email.html
index dd15ce20c0..2be96b7a4e 100644
--- a/server/templates/registration/invitation_email.html
+++ b/server/templates/registration/invitation_email.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% autoescape off %}
 {% blocktrans %}You're receiving this email because you have been invited to use Zentral.{% endblocktrans %}
 
-{% trans "Please go to the following page and choose a new password:" %}
+{% trans "Please go to the following page and set a new password:" %}
 {% block reset_link %}
 {{ reset_url }}
 {% endblock %}
diff --git a/server/templates/registration/login.html b/server/templates/registration/login.html
index 09e3ff2adf..a1ea2e8922 100644
--- a/server/templates/registration/login.html
+++ b/server/templates/registration/login.html
@@ -33,7 +33,7 @@ <h1 class="reg-title">
     </div>
     {% endfor %}
     <div class="text-start my-3">
-      <p><a href="{% url 'password_reset' %}">Password forgotten?</a></p>
+      <p><a href="{% url 'password_reset' %}">Forgot password?</a></p>
     </div>
     <button class="reg-btn-primary" type="submit">
       Sign in{% if login_realms %} with local credentials{% endif %}
diff --git a/server/templates/registration/password_reset_email.html b/server/templates/registration/password_reset_email.html
index d4a46c17e9..3a761bc59a 100644
--- a/server/templates/registration/password_reset_email.html
+++ b/server/templates/registration/password_reset_email.html
@@ -1,11 +1,11 @@
 {% load i18n %}{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your Zentral account.{% endblocktrans %}
+{% blocktrans %}You're receiving this email because a password reset has been initiated for your Zentral account.{% endblocktrans %}
 
-{% trans "Please go to the following page and choose a new password:" %}
+{% trans "Please go to the following page and set a new password:" %}
 {% block reset_link %}
 {{ reset_url }}
 {% endblock %}
-{% trans "Your username, in case you've forgotten:" %} {{ username }}
+{% trans "Your username, just in case:" %} {{ username }}
 
 {% trans "Thanks!" %}
 
diff --git a/server/templates/registration/password_reset_subject.txt b/server/templates/registration/password_reset_subject.txt
index 4fe164aa73..129d5274a5 100644
--- a/server/templates/registration/password_reset_subject.txt
+++ b/server/templates/registration/password_reset_subject.txt
@@ -1 +1 @@
-Password reset on Zentral
+Password reset for Zentral
diff --git a/tests/server_accounts/test_password_reset.py b/tests/server_accounts/test_password_reset.py
index 3331302b9a..45fbb277a8 100644
--- a/tests/server_accounts/test_password_reset.py
+++ b/tests/server_accounts/test_password_reset.py
@@ -32,8 +32,8 @@ def test_email_send_password_reset(self):
         handler.send_password_reset(self.user)
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.subject, "Password reset on Zentral")
-        self.assertIn(f"Your username, in case you've forgotten: {self.user.username}", email.body)
+        self.assertEqual(email.subject, "Password reset for Zentral")
+        self.assertIn(f"Your username, just in case: {self.user.username}", email.body)
 
     def test_email_send_invitation(self):
         handler = EmailPasswordResetHandler({})
diff --git a/tests/server_accounts/test_users_views.py b/tests/server_accounts/test_users_views.py
index 231bc5165f..72fac95a8c 100644
--- a/tests/server_accounts/test_users_views.py
+++ b/tests/server_accounts/test_users_views.py
@@ -813,8 +813,8 @@ def test_password_reset_post(self):
         self.assertTemplateUsed(response, "registration/password_reset_done.html")
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.subject, "Password reset on Zentral")
-        self.assertIn(f"Your username, in case you've forgotten: {self.ui_user.username}", email.body)
+        self.assertEqual(email.subject, "Password reset for Zentral")
+        self.assertIn(f"Your username, just in case: {self.ui_user.username}", email.body)
 
     # password change