diff --git a/lms/templates/registration/activate_account_notice.html b/lms/templates/registration/activate_account_notice.html index dc8b4e139f..db35b02e57 100644 --- a/lms/templates/registration/activate_account_notice.html +++ b/lms/templates/registration/activate_account_notice.html @@ -1,14 +1,21 @@ -<%! from django.utils.translation import ugettext as _ %> +<%page expression_filter="h"/> +<%! +from django.utils.translation import ugettext as _ +from openedx.core.djangolib.markup import HTML, Text +%>

${_("Thanks for Registering!")}

-

${_( +

${Text(_( "You've successfully created an account on {platform_name}. We've sent an account " - "activation message to {email}. To activate your account and start enrolling in " + "activation message to {email_start}{email}{email_end}. To activate your account and start enrolling in " "courses, click the link in the message." - ).format(email="{}".format(email), platform_name=platform_name + )).format(email_start=HTML(""), + email_end=HTML(""), + email=email, + platform_name=platform_name )}

diff --git a/lms/templates/registration/activation_complete.html b/lms/templates/registration/activation_complete.html index 217f83af94..1da56796a1 100644 --- a/lms/templates/registration/activation_complete.html +++ b/lms/templates/registration/activation_complete.html @@ -1,8 +1,10 @@ +<%page expression_filter="h"/> <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%! from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse +from openedx.core.djangolib.markup import HTML, Text %>
@@ -23,9 +25,11 @@ from django.core.urlresolvers import reverse %endif %if user_logged_in: - ${_("Visit your {link_start}dashboard{link_end} to see your courses.").format(link_start=''.format(url=reverse('dashboard')), link_end='')} + ${Text(_("Visit your {link_start}dashboard{link_end} to see your courses.")).format( + link_start=HTML('').format(url=reverse('dashboard')), link_end=HTML(''))} %else: - ${_("You can now {link_start}log in{link_end}.").format(link_start=''.format(url=reverse('signin_user')), link_end='')} + ${Text(_("You can now {link_start}log in{link_end}.")).format( + link_start=HTML('').format(url=reverse('signin_user')), link_end=HTML(''))} %endif

diff --git a/lms/templates/registration/activation_invalid.html b/lms/templates/registration/activation_invalid.html index 9744ccdce5..0de6f4c6f9 100644 --- a/lms/templates/registration/activation_invalid.html +++ b/lms/templates/registration/activation_invalid.html @@ -1,8 +1,10 @@ +<%page expression_filter="h"/> <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%! from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse +from openedx.core.djangolib.markup import HTML, Text %>
@@ -11,11 +13,16 @@ from django.core.urlresolvers import reverse

${_("Activation Invalid")}


-

${_('Something went wrong. Check to make sure the URL you went to was ' - 'correct -- e-mail programs will sometimes split it into two ' - 'lines. If you still have issues, e-mail us to let us know what happened ' - 'at {email}.').format(email='{email}'.format(email=settings.BUGS_EMAIL))}

+

${Text(_('Something went wrong. Check to make sure the URL you went to was ' + 'correct -- e-mail programs will sometimes split it into two ' + 'lines. If you still have issues, e-mail us to let us know what happened ' + 'at {email_start}{email}{email_end}.')).format( + email_start=HTML('').format(settings.BUGS_EMAIL), + email=settings.BUGS_EMAIL, + email_end=HTML('') + )}

-

${_('Or you can go back to the {link_start}home page{link_end}.').format(link_start='', link_end='')}

+

${Text(_('Or you can go back to the {link_start}home page{link_end}.')).format( + link_start=HTML(''), link_end=HTML(''))}