Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11912 from edx/dan-f/fix-accidental-extra-escaping

Browse Source 
Fix accidental extra escaping
This commit is contained in:
Daniel Friedman
2016-03-23 15:55:18 -04:00
parent 679cdc3775 56b1196246
commit 08ddeca426
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/templates/activation_complete.html
View File

@@ -9,8 +9,8 @@ from django.utils.translation import ugettext as _
<div class="wrapper-mast wrapper sr">
<header class="mast">
<h1 class="page-header">
${_("{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),
)}
</h1>
</header>
@@ -26,7 +26,7 @@ from django.utils.translation import ugettext as _
<h1 class="title">${_("Your account activation is complete!")}</h1>
<div class="copy">
<p>
${_("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)
)}
</p>
@@ -36,7 +36,7 @@ from django.utils.translation import ugettext as _
<ul class="list-actions">
<li class="action-item">
<a href="/signin" class="action-primary action-signin">
${_("Sign into {studio_name}").format(
${Text(_("Sign into {studio_name}")).format(
studio_name=Text(settings.STUDIO_SHORT_NAME)
)}
</a>

4
cms/templates/activation_invalid.html
View File

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _
<div class="wrapper-mast wrapper sr">
<header class="mast">
<h1 class="page-header">
${_("{studio_name} Account Activation").format(
${Text(_("{studio_name} Account Activation")).format(
studio_name=Text(settings.STUDIO_SHORT_NAME)
)}
</h1>
@@ -27,7 +27,7 @@ from django.utils.translation import ugettext as _
<div class="copy">
<p>${_("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.")}</p>
<p>
${_("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('<a href="/">'),