Skip to content

E
edx-platform
Commit 5d4edc61 by Adam Palay Committed by Jay Zoldak
Options

add settings.PLATFORM_NAME to password_reset_confirm context

parent 5ed8d557
Showing with 26 additions and 5 deletions
common/djangoapps/student/views.py
...@@ -1037,7 +1037,11 @@ def password_reset(request): ...@@ -1037,7 +1037,11 @@ def password_reset(request):
'error': _('Invalid e-mail or user')})) 'error': _('Invalid e-mail or user')}))
def password_reset_confirm_wrapper(request, uidb36=None, token=None): def password_reset_confirm_wrapper(
request,
uidb36=None,
token=None,
):
''' A wrapper around django.contrib.auth.views.password_reset_confirm. ''' A wrapper around django.contrib.auth.views.password_reset_confirm.
Needed because we want to set the user as active at this step. Needed because we want to set the user as active at this step.
''' '''
...@@ -1049,7 +1053,12 @@ def password_reset_confirm_wrapper(request, uidb36=None, token=None): ...@@ -1049,7 +1053,12 @@ def password_reset_confirm_wrapper(request, uidb36=None, token=None):
user.save() user.save()
except (ValueError, User.DoesNotExist): except (ValueError, User.DoesNotExist):
pass pass
return password_reset_confirm(request, uidb36=uidb36, token=token) # we also want to pass settings.PLATFORM_NAME in as extra_context
extra_context = {"platform_name": settings.PLATFORM_NAME}
return password_reset_confirm(
request, uidb36=uidb36, token=token, extra_context=extra_context
)
def reactivation_email_for_user(user): def reactivation_email_for_user(user):
......
lms/templates/registration/password_reset_confirm.html
...@@ -5,7 +5,11 @@ ...@@ -5,7 +5,11 @@
<html> <html>
<head> <head>
<title>{% trans "Reset Your edX Password" %}</title> <title>
{% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password
{% endblocktrans %}
</title>
{% compressed_css 'application' %} {% compressed_css 'application' %}
...@@ -53,7 +57,11 @@ ...@@ -53,7 +57,11 @@
<section class="passwordreset container"> <section class="passwordreset container">
<section class="introduction"> <section class="introduction">
<header> <header>
<h1>{% trans "Reset Your edX Password" %}</h1> <h1>
{% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password
{% endblocktrans %}
</h1>
</header> </header>
</section> </section>
...@@ -66,7 +74,11 @@ ...@@ -66,7 +74,11 @@
<form role="form" id="passwordreset-form" method="post" data-remote="true" action="">{% csrf_token %} <form role="form" id="passwordreset-form" method="post" data-remote="true" action="">{% csrf_token %}
<!-- status messages --> <!-- status messages -->
<div role="alert" class="status message"> <div role="alert" class="status message">
<h3 class="message-title">{% trans "We're sorry, edX enrollment is not available in your region" %}</h3> <h3 class="message-title">
{% blocktrans with platform_name=platform_name %}
We're sorry, {{ platform_name }} enrollment is not available in your region
{% endblocktrans %}
</h3>
</div> </div>
<div role="alert" class="status message submission-error"> <div role="alert" class="status message submission-error">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment