diff --git a/lms/templates/registration/password_reset_complete.html b/lms/templates/registration/password_reset_complete.html index 3f301102b5..6ccb75ed26 100644 --- a/lms/templates/registration/password_reset_complete.html +++ b/lms/templates/registration/password_reset_complete.html @@ -1,4 +1,3 @@ -<%! from django.utils.translation import ugettext as _ %> {% load i18n %} {% load compressed %} {% load staticfiles %} @@ -6,7 +5,7 @@ - ${_("Your Password Reset is Complete")} + {% trans "Your Password Reset is Complete" %} {% compressed_css 'application' %} @@ -54,13 +53,15 @@
-

${_("Your Password Reset is Complete")}

+

{% trans "Your Password Reset is Complete" %}

{% block content %}
-

${_('Your password has been set. You may go ahead and {link_start}log in{link_end} now.').format(link_start='', link_end='')}

+ {% blocktrans with link_start='' link_end='' %} + Your password has been set. You may go ahead and {{ link_start }}log in{{ link_end }} now. + {% endblocktrans %}
{% endblock %}
diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html index 6a568545d1..afbaa22683 100644 --- a/lms/templates/registration/password_reset_confirm.html +++ b/lms/templates/registration/password_reset_confirm.html @@ -1,11 +1,11 @@ -<%! from django.utils.translation import ugettext as _ %> +{% load i18n %} {% load compressed %} {% load staticfiles %} - ${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)} +{% trans "Reset Your edX Password" %} {% compressed_css 'application' %} @@ -53,78 +53,77 @@
-

${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)}

+

{% trans "Reset Your edX Password" %}

{% if validlink %}
-

${_("Password Reset Form")}

+

{% trans "Password Reset Form" %}

{% csrf_token %}

- ${_('Please enter your new password twice so we can verify you typed it in correctly.
' - 'Required fields are noted by bold text and an asterisk (*).')} + {% trans 'Please enter your new password twice so we can verify you typed it in correctly.
Required fields are noted by bold text and an asterisk (*).' %}

- ${_("Required Information")} + {% trans "Required Information" %}
  1. - +
  2. - +
- +
{% else %}
-

${_("Your Password Reset Was Unsuccessful")}

+

{% trans "Your Password Reset Was Unsuccessful" %}

-

${_('The password reset link was invalid, possibly because the link has already been used. Please return to the login page and start the password reset process again.')}

+

{% trans 'The password reset link was invalid, possibly because the link has already been used. Please return to the login page and start the password reset process again.' %}

{% endif %}