From 89823681ad2b337a2dbc2ffd93ef5734fc977aee Mon Sep 17 00:00:00 2001
From: Tung Nguyen <nvntung@gmail.com>
Date: Wed, 5 Feb 2020 12:14:29 +0000
Subject: [PATCH] reword some messages, correct typos and spelling mistakes

---
 app/auth/templates/auth/forgot_password.html   | 4 ++--
 app/auth/templates/auth/login.html             | 9 ++++-----
 app/dashboard/views/setting.py                 | 2 +-
 templates/emails/transactional/activation.html | 5 +++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/auth/templates/auth/forgot_password.html b/app/auth/templates/auth/forgot_password.html
index 73a61488..28b6b11d 100644
--- a/app/auth/templates/auth/forgot_password.html
+++ b/app/auth/templates/auth/forgot_password.html
@@ -13,11 +13,11 @@
     {{ 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>
+      <p class="text-muted">Enter your email address you signed up with and you will receive an email to reset your password.</p>
 
       <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="Your 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..ae30f8f8 100644
--- a/app/auth/templates/auth/login.html
+++ b/app/auth/templates/auth/login.html
@@ -83,12 +83,11 @@
             <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: lighter; margin: auto">
 
-          We don't 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.
+          We DO NOT USE Facebook/Google SDK to prevent their trackers from listening to your personal information. <br>
+          However, when using one of the social login buttons above, please keep in mind that you agree with
+          this social network on <strong>knowing</strong> you are using SimpleLogin.
 
           <span class="badge badge-warning">Warning</span>
 
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..63fe0c9f 100644
--- a/templates/emails/transactional/activation.html
+++ b/templates/emails/transactional/activation.html
@@ -3,7 +3,8 @@
 {% block content %}
   {{ 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_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 email", activation_link) }}
 {% endblock %}