- ${_('The page that you were looking for was not found.')}
- ${_('Go back to the {homepage} or let us know about any pages that may have been moved at {email}.').format(
- homepage='homepage',
- email=u'{address}'.format(
- address=settings.TECH_SUPPORT_EMAIL,
- ))}
+
+ ${_('The page that you were looking for was not found.')}
+ ${Text(_('Go back to the {homepage} or let us know about any pages that may have been moved at {email}.')).format(
+ homepage=HTML('homepage'),
+ email=HTML('{address}'.format(
+ address=Text(settings.TECH_SUPPORT_EMAIL)
+ ))
+ )}
diff --git a/cms/templates/500.html b/cms/templates/500.html
index 31ec1dd958..6b77cda024 100644
--- a/cms/templates/500.html
+++ b/cms/templates/500.html
@@ -1,6 +1,14 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%page expression_filter="h"/>
+<%!
+from openedx.core.djangolib.markup import Text, HTML
+from django.utils.translation import ugettext as _
+%>
<%inherit file="base.html" />
-<%block name="title">${_("{studio_name} Server Error").format(studio_name=settings.STUDIO_SHORT_NAME)}
+<%block name="title">
+${Text(_("{studio_name} Server Error")).format(
+ studio_name=Text(settings.STUDIO_SHORT_NAME)
+)}
+
<%block name="bodyclass">view-util util-500
<%block name="content">
@@ -8,20 +16,24 @@
- ${_("The {studio_name} servers encountered an error").format(
- studio_name=u"{studio_name}".format(studio_name=settings.STUDIO_SHORT_NAME)
+ ${Text(_(u"The {em_start}{studio_name}{em_end} servers encountered an error")).format(
+ em_start=HTML(''),
+ em_end=HTML(''),
+ studio_name=Text(settings.STUDIO_SHORT_NAME),
)}
- ${_("An error occurred in {studio_name} and the page could not be loaded. Please try again in a few moments.").format(studio_name=settings.STUDIO_SHORT_NAME)}
+ ${Text(_("An error occurred in {studio_name} and the page could not be loaded. Please try again in a few moments.")).format(
+ studio_name=Text(settings.STUDIO_SHORT_NAME),
+ )}
${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")}
- ${_('If the problem persists, please email us at {email_link}.').format(
- email_link=u'{email_address}'.format(
- email_address=settings.TECH_SUPPORT_EMAIL,
- )
- )}
+ ${Text(_(u'If the problem persists, please email us at {email_link}.')).format(
+ email_link=HTML(u'{email_address}'.format(
+ email_address=Text(settings.TECH_SUPPORT_EMAIL),
+ ))
+ )}
diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html
index 135f15764d..fa39f13ac8 100644
--- a/cms/templates/activation_complete.html
+++ b/cms/templates/activation_complete.html
@@ -1,10 +1,18 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+from openedx.core.djangolib.markup import Text
+from django.utils.translation import ugettext as _
+%>
+<%page expression_filter="h"/>
<%inherit file="base.html" />
<%block name="content">
${_("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(
- platform_name=settings.PLATFORM_NAME, studio_name=settings.STUDIO_NAME,
- link_start='', link_end=""
- )}
+
+ ${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(''),
+ link_end=HTML('')
+ )}
+
diff --git a/cms/templates/dev/dev_mode.html b/cms/templates/dev/dev_mode.html
index 9ee409d5de..71252bad1f 100644
--- a/cms/templates/dev/dev_mode.html
+++ b/cms/templates/dev/dev_mode.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%inherit file="../base.html" />
<%block name="content">
You're in dev mode!
diff --git a/cms/templates/js/content-group-details.underscore b/cms/templates/js/content-group-details.underscore
index b5bc267411..670fab89fb 100644
--- a/cms/templates/js/content-group-details.underscore
+++ b/cms/templates/js/content-group-details.underscore
@@ -3,7 +3,7 @@
<% if (!_.isEmpty(usage)) { %>
-
<%= gettext('This Group Configuration is used in:') %>
+
<%- gettext('This Group Configuration is used in:') %>
<% _.each(usage, function(unit) { %>
-
-
><%= unit.label %>
+ ><%- unit.label %>
<% if (unit.validation) { %>
<% if (unit.validation.type === 'warning') { %>
@@ -71,7 +71,7 @@
<% } %>
- <%= unit.validation.text %>
+ <%- unit.validation.text %>
<% } %>
@@ -80,6 +80,7 @@
<% } else { %>
+
<%= outlineAnchorMessage %>
<% } %>
diff --git a/cms/templates/js/validation-error-modal.underscore b/cms/templates/js/validation-error-modal.underscore
index 5d82d7cd06..0347b8a06f 100644
--- a/cms/templates/js/validation-error-modal.underscore
+++ b/cms/templates/js/validation-error-modal.underscore
@@ -2,17 +2,17 @@
<%= _.template(
- ngettext(
- "There was {strong_start}{num_errors} validation error{strong_end} while trying to save the course settings in the database.",
- "There were {strong_start}{num_errors} validation errors{strong_end} while trying to save the course settings in the database.",
- num_errors
- ),
- {
- strong_start:'',
- num_errors: num_errors,
- strong_end: ''
- },
- {interpolate: /\{(.+?)\}/g})%>
+ ngettext(
+ "There was {strong_start}{num_errors} validation error{strong_end} while trying to save the course settings in the database.",
+ "There were {strong_start}{num_errors} validation errors{strong_end} while trying to save the course settings in the database.",
+ num_errors
+ ),
+ {interpolate: /\{(.+?)\}/g})(
+ {
+ strong_start:'',
+ num_errors: num_errors,
+ strong_end: ''
+ })%>
<%= gettext("Please check the following validation feedbacks and reflect them in your course settings:")%>
diff --git a/cms/templates/ux/reference/index.html b/cms/templates/ux/reference/index.html
index eeb956f495..4121778dcd 100644
--- a/cms/templates/ux/reference/index.html
+++ b/cms/templates/ux/reference/index.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%inherit file="../../base.html" />
<%block name="view_notes">
diff --git a/cms/templates/ux/reference/modal_access-component.html b/cms/templates/ux/reference/modal_access-component.html
index c52c26cc7e..7608244c3e 100644
--- a/cms/templates/ux/reference/modal_access-component.html
+++ b/cms/templates/ux/reference/modal_access-component.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
diff --git a/cms/templates/ux/reference/modal_bulkpublish-section.html b/cms/templates/ux/reference/modal_bulkpublish-section.html
index 088f74e545..7534c363ad 100644
--- a/cms/templates/ux/reference/modal_bulkpublish-section.html
+++ b/cms/templates/ux/reference/modal_bulkpublish-section.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
diff --git a/cms/templates/ux/reference/modal_bulkpublish-subsection.html b/cms/templates/ux/reference/modal_bulkpublish-subsection.html
index 634d4f6d69..72d0c4625c 100644
--- a/cms/templates/ux/reference/modal_bulkpublish-subsection.html
+++ b/cms/templates/ux/reference/modal_bulkpublish-subsection.html
@@ -1,3 +1,4 @@
+<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>