From dd02a50bad75d99758e4fc78c6f5d2eeb97dcde4 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Thu, 6 Feb 2020 11:37:10 +0700
Subject: [PATCH] Improve wordings

- forgot password page
- login page
- activation email
- reset password email
---
 app/auth/templates/auth/forgot_password.html       | 6 +++---
 app/auth/templates/auth/login.html                 | 6 +++---
 app/auth/templates/auth/register.html              | 4 ++--
 app/dashboard/views/setting.py                     | 2 +-
 templates/emails/transactional/activation.html     | 2 +-
 templates/emails/transactional/reset-password.html | 5 ++++-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/auth/templates/auth/forgot_password.html b/app/auth/templates/auth/forgot_password.html
index 73a61488..1955479c 100644
--- a/app/auth/templates/auth/forgot_password.html
+++ b/app/auth/templates/auth/forgot_password.html
@@ -12,12 +12,12 @@
   <form class="card" method="post">
     {{ form.csrf_token }}
     <div class="card-body p-6">
-      <div class="card-title">Forgot password</div>
-      <p class="text-muted">Enter your email address and your will receive an email to reset your password.</p>
+      <div class="card-title text-center">Forgot password</div>
 
       <div class="form-group">
         <label class="form-label">Email address</label>
-        {{ form.email(class="form-control", type="email", placeholder="Enter email") }}
+        {{ form.email(class="form-control", type="email",
+            placeholder="The email address associated with your SimpleLogin account") }}
         {{ render_field_errors(form.email) }}
       </div>
 
diff --git a/app/auth/templates/auth/login.html b/app/auth/templates/auth/login.html
index e584ba5c..3bd8cb41 100644
--- a/app/auth/templates/auth/login.html
+++ b/app/auth/templates/auth/login.html
@@ -83,9 +83,9 @@
             <i class="fa fa-facebook"></i> Sign in with Facebook
           </a>
         </div>
-        <div class="text-center p-3" style="font-size: 12px; font-weight: light; margin: auto">
+        <div class="text-center p-3" style="font-size: 12px; font-weight: 300; margin: auto">
 
-          We don't use the Facebook/Google SDK to avoid their trackers. <br>
+          We do not use the Facebook/Google SDK to avoid their trackers. <br>
 
           However when using a social login button, please keep in mind that this social network will <b>know</b> that
           you are using SimpleLogin.
@@ -97,6 +97,6 @@
 
 
     </div>
-
+  </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/app/auth/templates/auth/register.html b/app/auth/templates/auth/register.html
index 49b934a0..9de4c33d 100644
--- a/app/auth/templates/auth/register.html
+++ b/app/auth/templates/auth/register.html
@@ -78,9 +78,9 @@
           </a>
 
         </div>
-        <div class="text-center p-3" style="font-size: 12px; font-weight: light; margin: auto">
+        <div class="text-center p-3" style="font-size: 12px; font-weight: 300; margin: auto">
 
-          We don't use the Facebook/Google SDK to avoid their trackers. <br>
+          We do not use the Facebook/Google SDK to avoid their trackers. <br>
 
           However when using a social login button, please keep in mind that this social network will <b>know</b> that
           you are using SimpleLogin.
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index 04bab18c..f83e9a77 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -194,7 +194,7 @@ def send_reset_password_email(user):
     email_utils.send_reset_password_email(user.email, user.name, reset_password_link)
 
     flash(
-        "You are going to receive an email containing instruction to change your password",
+        "You are going to receive an email containing instructions to change your password",
         "success",
     )
 
diff --git a/templates/emails/transactional/activation.html b/templates/emails/transactional/activation.html
index b10f3736..fd5b7718 100644
--- a/templates/emails/transactional/activation.html
+++ b/templates/emails/transactional/activation.html
@@ -4,6 +4,6 @@
   {{ render_text("Hi " + name) }}
   {{ render_text("Thank you for choosing SimpleLogin.") }}
   {{ render_text("To get started, please confirm that <b>" + email + "</b> is your email address by clicking on the button below or use this link " + activation_link + " within 1 hour.") }}
-  {{ render_button("Verify", activation_link) }}
+  {{ render_button("Verify email", activation_link) }}
 {% endblock %}
 
diff --git a/templates/emails/transactional/reset-password.html b/templates/emails/transactional/reset-password.html
index 874bf9b9..8b117ffa 100644
--- a/templates/emails/transactional/reset-password.html
+++ b/templates/emails/transactional/reset-password.html
@@ -4,6 +4,9 @@
   {{ render_text("Hi " + name) }}
   {{ render_text("You have asked to change your password.") }}
   {{ render_text("To confirm, please click on the button below or use this link " + reset_password_link + " within 1 hour.") }}
-  {{ render_button("Reset password", reset_password_link) }}
+  {{ render_button("Reset your password", reset_password_link) }}
+
+  {{ render_text("If the password token has expired, you can request a new link by following the same process as before.") }}
+  {{ render_text("If you did not request a password reset, no further action is required.") }}
 {% endblock %}