From c3aa5149f1da4df43c7a7a0cd3d8d81794a01d09 Mon Sep 17 00:00:00 2001
From: Zubir Afzal <zubair.fast@gmail.com>
Date: Wed, 23 Jan 2019 17:20:24 +0500
Subject: [PATCH] ENT-1438 Update wording in account recovery flow

---
 common/djangoapps/student/forms.py                 |  1 +
 .../edx_ace/accountrecovery/email/body.html        | 14 ++++++++++++--
 .../student/edx_ace/accountrecovery/email/body.txt |  8 +++++---
 .../edx_ace/accountrecovery/email/subject.txt      |  2 +-
 .../views/account_settings_factory.js              |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/common/djangoapps/student/forms.py b/common/djangoapps/student/forms.py
index a44b35fdab..f1c4763d91 100644
--- a/common/djangoapps/student/forms.py
+++ b/common/djangoapps/student/forms.py
@@ -77,6 +77,7 @@ def send_account_recovery_email_for_user(user, request, email=None):
     message_context = get_base_template_context(site)
     message_context.update({
         'request': request,  # Used by google_analytics_tracking_pixel
+        'email': email,
         'platform_name': configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
         'reset_link': '{protocol}://{site}{link}?is_account_recovery=true'.format(
             protocol='https' if request.is_secure() else 'http',
diff --git a/common/templates/student/edx_ace/accountrecovery/email/body.html b/common/templates/student/edx_ace/accountrecovery/email/body.html
index 1bbe370c7b..d696dac8ff 100644
--- a/common/templates/student/edx_ace/accountrecovery/email/body.html
+++ b/common/templates/student/edx_ace/accountrecovery/email/body.html
@@ -15,11 +15,21 @@
             </p>
 
             <p style="color: rgba(0,0,0,.75);">
-                {% trans "If you didn't request this change, you can disregard this email - we have not yet created your password." %}
+                {% trans "We've restored access to your edX account using the recovery email you provided at registration." %}
                 <br />
             </p>
 
-            {% trans "Create my Password" as course_cta_text %}
+            <p style="color: rgba(0,0,0,.75);">
+                {% blocktrans %}Once you've created a password [below], you will be able to log in to edX with this email ({{ email }}) and your new password.{% endblocktrans %}
+                <br />
+            </p>
+
+            <p style="color: rgba(0,0,0,.75);">
+                {% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." %}
+                <br />
+            </p>
+
+            {% trans "Create Password" as course_cta_text %}
 
             {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
         </td>
diff --git a/common/templates/student/edx_ace/accountrecovery/email/body.txt b/common/templates/student/edx_ace/accountrecovery/email/body.txt
index 94dc1c4672..7d53f3da6d 100644
--- a/common/templates/student/edx_ace/accountrecovery/email/body.txt
+++ b/common/templates/student/edx_ace/accountrecovery/email/body.txt
@@ -1,12 +1,14 @@
 {% load i18n %}{% autoescape off %}
 {% blocktrans %}You're receiving this e-mail because you requested to create a password for your user account at {{ platform_name }}.{% endblocktrans %}
 
-{% trans "Please go to the following page and choose a new password:" %}
+{% trans "We've restored access to your edX account using the recovery email you provided at registration." %}
+
+{% blocktrans %}Once you've created a password [below], you will be able to log in to edX with this email ({{ email }}) and your new password.{% endblocktrans %}
+
+{% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." %}
 
 {{ reset_link }}
 
-{% trans "If you didn't request this change, you can disregard this email - we have not yet created your password." %}
-
 {% trans "Thanks for using our site!" %}
 {% blocktrans %}The {{ platform_name }} Team{% endblocktrans %}
 {% endautoescape %}
diff --git a/common/templates/student/edx_ace/accountrecovery/email/subject.txt b/common/templates/student/edx_ace/accountrecovery/email/subject.txt
index 959c30c293..6d3608a656 100644
--- a/common/templates/student/edx_ace/accountrecovery/email/subject.txt
+++ b/common/templates/student/edx_ace/accountrecovery/email/subject.txt
@@ -1,4 +1,4 @@
 {% load i18n %}
 {% autoescape off %}
-{% blocktrans trimmed %}Create password on {{ platform_name }}{% endblocktrans %}
+{% blocktrans trimmed %}Password creation on {{ platform_name }}{% endblocktrans %}
 {% endautoescape %}
diff --git a/lms/static/js/student_account/views/account_settings_factory.js b/lms/static/js/student_account/views/account_settings_factory.js
index d8231d9f2a..402874358b 100644
--- a/lms/static/js/student_account/views/account_settings_factory.js
+++ b/lms/static/js/student_account/views/account_settings_factory.js
@@ -86,7 +86,7 @@
 
             secondaryEmailFieldData = {
                 model: userAccountModel,
-                title: gettext('Secondary Email Address'),
+                title: gettext('Recovery Address'),
                 valueAttribute: 'secondary_email',
                 helpMessage: gettext('You may access your account when single-sign on is not available.'),
                 persistChanges: true