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

Merge pull request #13740 from edx/tasawer/ecom-5684/forgot-password-verbiage-pdate

Browse Source 
Forgot Password - Verbiage Update
This commit is contained in:
Tasawer Nawaz
2016-10-17 16:03:55 +05:00
committed by GitHub
parent 19496aef5d ab8e5b82b6
commit 252880e5de
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/test/acceptance/tests/lms/test_lms.py
View File

@@ -81,7 +81,7 @@ class ForgotPasswordPageTest(UniqueCourseTest):
self.reset_password_page.is_success_visible(".submission-success")
# Expect that we're shown a success message
self.assertIn("Password Reset Email Sent", self.reset_password_page.get_success_message())
self.assertIn("Check Your Email", self.reset_password_page.get_success_message())
@attr(shard=8)
@@ -143,7 +143,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
self.login_page.visit().password_reset(email=email)
# Expect that we're shown a success message
self.assertIn("Password Reset Email Sent", self.login_page.wait_for_success())
self.assertIn("Check Your Email", self.login_page.wait_for_success())
def test_password_reset_no_user(self):
# Navigate to the password reset form
@@ -153,7 +153,7 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
self.login_page.password_reset(email="nobody@nowhere.com")
# Expect that we're shown a success message
self.assertIn("Password Reset Email Sent", self.login_page.wait_for_success())
self.assertIn("Check Your Email", self.login_page.wait_for_success())
def test_third_party_login(self):
"""

31
lms/static/js/student_account/views/LoginView.js
View File

@@ -37,13 +37,6 @@
render: function(html) {
var fields = html || '';
this.successMessage = HtmlUtils.interpolateHtml(
// eslint-disable-next-line
gettext('We have sent an email message with password reset instructions to the email address you provided. If you do not receive this message, {anchorStart}contact technical support{anchorEnd}.'), { // eslint-disable-line max-len
anchorStart: HtmlUtils.HTML('<a href="' + this.supportURL + '">'),
anchorEnd: HtmlUtils.HTML('</a>')
}
);
$(this.el).html(_.template(this.tpl)({
// We pass the context object to the template so that
@@ -93,16 +86,26 @@
},
resetEmail: function() {
var email = $('#password-reset-email').val(),
successMessage;
this.element.hide(this.$errors);
this.resetMessage = this.$resetSuccess.find('.message-copy');
successMessage = HtmlUtils.interpolateHtml(
gettext('{paragraphStart}You entered {boldStart}{email}{boldEnd}. If this email address is associated with an edX account, we will send a message with password reset instructions to this email address.{paragraphEnd}' + // eslint-disable-line max-len
'{paragraphStart}If you do not receive a password reset message, verify that you entered the correct email address, or check your spam folder.{paragraphEnd}' + // eslint-disable-line max-len
'{paragraphStart}If you need further assistance, {anchorStart}contact technical support{anchorEnd}.{paragraphEnd}'), { // eslint-disable-line max-len
boldStart: HtmlUtils.HTML('<b>'),
boldEnd: HtmlUtils.HTML('</b>'),
paragraphStart: HtmlUtils.HTML('<p>'),
paragraphEnd: HtmlUtils.HTML('</p>'),
email: email,
anchorStart: HtmlUtils.HTML('<a href="' + this.supportURL + '">'),
anchorEnd: HtmlUtils.HTML('</a>')
});
if (this.resetMessage.find('p').length === 0) {
this.resetMessage.append(
HtmlUtils.joinHtml(
HtmlUtils.HTML('<p>'),
this.successMessage,
HtmlUtils.HTML('</p>')
).toString()
);
this.resetMessage.append(HtmlUtils.joinHtml(successMessage).toString());
}
this.element.show(this.$resetSuccess);
},

2
lms/templates/student_account/login.underscore
View File

@@ -8,7 +8,7 @@
<div aria-live="polite">
<div class="js-reset-success status submission-success hidden">
<h4 class="message-title"><%- gettext("Password Reset Email Sent") %></h4>
<h4 class="message-title"><%- gettext("Check Your Email") %></h4>
<div class="message-copy">
</div>
</div>