From 56b11962466bc5c1f115cd2a12129923761afd91 Mon Sep 17 00:00:00 2001 From: Daniel Friedman Date: Wed, 23 Mar 2016 14:46:35 -0400 Subject: [PATCH] Fix accidental extra escaping --- cms/templates/activation_complete.html | 8 ++++---- cms/templates/activation_invalid.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html index 768f17f054..fa39f13ac8 100644 --- a/cms/templates/activation_complete.html +++ b/cms/templates/activation_complete.html @@ -9,8 +9,8 @@ from django.utils.translation import ugettext as _

- ${_("{studio_name} Account Activation").format( - studio_name=Text(settings.STUDIO_SHORT_NAME) + ${Text(_("{studio_name} Account Activation")).format( + studio_name=Text(settings.STUDIO_SHORT_NAME), )}

@@ -26,7 +26,7 @@ from django.utils.translation import ugettext as _

${_("Your account activation is complete!")}

- ${_("Thank you for activating your account. You may now sign in and start using {studio_name} to author courses.").format( + ${Text(_("Thank you for activating your account. You may now sign in and start using {studio_name} to author courses.")).format( studio_name=Text(settings.STUDIO_NAME) )}

@@ -36,7 +36,7 @@ from django.utils.translation import ugettext as _
  • diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html index bdb135ee3b..66c5e06c9d 100644 --- a/cms/templates/activation_invalid.html +++ b/cms/templates/activation_invalid.html @@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _

    - ${_("{studio_name} Account Activation").format( + ${Text(_("{studio_name} Account Activation")).format( studio_name=Text(settings.STUDIO_SHORT_NAME) )}

    @@ -27,7 +27,7 @@ from django.utils.translation import ugettext as _

    ${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct, as e-mail programs will sometimes split it into two lines.")}

    - ${_("If you still have issues, contact {platform_name} Support. In the meantime, you can also return to {link_start}the {studio_name} homepage.{link_end}").format( + ${Text(_("If you still have issues, contact {platform_name} Support. In the meantime, you can also return to {link_start}the {studio_name} homepage.{link_end}")).format( platform_name=Text(settings.PLATFORM_NAME), studio_name=Text(settings.STUDIO_NAME), link_start=HTML(''),