Commit 32b8391c by Douglas Hall Committed by GitHub

Merge pull request #12766 from edx/patch/2016-06-15

Patch Release 2016-06-15
parents f643f2dc 5e13fb49
...@@ -77,7 +77,7 @@ class LoginSessionView(APIView): ...@@ -77,7 +77,7 @@ class LoginSessionView(APIView):
# Translators: These instructions appear on the login form, immediately # Translators: These instructions appear on the login form, immediately
# below a field meant to hold the user's email address. # below a field meant to hold the user's email address.
email_instructions = _("The email address you used to register with {platform_name}").format( email_instructions = _("The email address you used to register with {platform_name}").format(
platform_name=settings.PLATFORM_NAME platform_name=get_themed_value('PLATFORM_NAME', settings.PLATFORM_NAME)
) )
form_desc.add_field( form_desc.add_field(
...@@ -920,7 +920,7 @@ class PasswordResetView(APIView): ...@@ -920,7 +920,7 @@ class PasswordResetView(APIView):
# Translators: These instructions appear on the password reset form, # Translators: These instructions appear on the password reset form,
# immediately below a field meant to hold the user's email address. # immediately below a field meant to hold the user's email address.
email_instructions = _(u"The email address you used to register with {platform_name}").format( email_instructions = _(u"The email address you used to register with {platform_name}").format(
platform_name=settings.PLATFORM_NAME platform_name=get_themed_value('PLATFORM_NAME', settings.PLATFORM_NAME)
) )
form_desc.add_field( form_desc.add_field(
......
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