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

Patch Release 2016-06-15
This commit is contained in:
Douglas Hall
2016-06-15 16:51:45 -04:00
committed by GitHub

View File

@@ -77,7 +77,7 @@ class LoginSessionView(APIView):
# Translators: These instructions appear on the login form, immediately
# below a field meant to hold the user's email address.
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(
@@ -920,7 +920,7 @@ class PasswordResetView(APIView):
# Translators: These instructions appear on the password reset form,
# 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(
platform_name=settings.PLATFORM_NAME
platform_name=get_themed_value('PLATFORM_NAME', settings.PLATFORM_NAME)
)
form_desc.add_field(