Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19646 from edx/zub/ENT-1438-recovery-flow-wording

Browse Source 
ENT-1438 Update wording in account recovery flow
This commit is contained in:
Zubair Afzal
2019-01-24 14:56:23 +05:00
committed by GitHub
parent b010dfd0f8 c3aa5149f1
commit c5d3fb45da
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/djangoapps/student/forms.py
View File

@@ -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',

14
common/templates/student/edx_ace/accountrecovery/email/body.html
View File

@@ -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>

8
common/templates/student/edx_ace/accountrecovery/email/body.txt
View File

@@ -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 %}

2
common/templates/student/edx_ace/accountrecovery/email/subject.txt
View File

@@ -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 %}

2
lms/static/js/student_account/views/account_settings_factory.js
View File

@@ -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