- <%= gettext("License Type") %> + <%- gettext("License Type") %>
-
<% var link_start_tpl = ''; %>
@@ -14,8 +14,8 @@
- <%= - interpolate( - gettext("Create a %(link_start)sMozilla Backpack%(link_end)s account, or log in to your existing account"), - {link_start: '', link_end: ''}, - true - )%> - -
- <%= - interpolate( - gettext("%(download_link_start)sDownload this image (right-click or option-click, save as)%(link_end)s and then %(upload_link_start)supload%(link_end)s it to your backpack. "), { - download_link_start: '', - link_end: '', upload_link_start: '' - }, - true - )%> +
- + <%= edx.HtmlUtils.interpolateHtml( + gettext("Create a {link_start}Mozilla Backpack{link_end} account, or log in to your existing account"), + { + link_start: edx.HtmlUtils.HTML(''), + link_end: edx.HtmlUtils.HTML('') + } + ) + %> + + +
- + <%= edx.HtmlUtils.interpolateHtml( + gettext("{download_link_start}Download this image (right-click or option-click, save as){link_end} and then {upload_link_start}upload{link_end} it to your backpack."), + { + download_link_start: edx.HtmlUtils.joinHtml( + edx.HtmlUtils.HTML(''), + ), + link_end: edx.HtmlUtils.HTML(''), + upload_link_start: edx.HtmlUtils.HTML('') + } + ) + %> +
<% if(license.url) { %> - - <%= gettext("Learn more about {license_name}") + + <%- gettext("Learn more about {license_name}") .replace("{license_name}", license.name) %> @@ -71,15 +71,15 @@ <% if (showPreview) { %>
- <%= gettext("License Display") %> + <%- gettext("License Display") %>
- <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course:") %> + <%- gettext("The following message will be displayed at the bottom of the courseware pages within your course:") %>
<% // keep this synchronized with the contents of common/templates/license.html %>
<% if (model.type === "all-rights-reserved") { %>
- © <%= gettext("All Rights Reserved") %>
+ © <%- gettext("All Rights Reserved") %>
<% } else if (model.type === "creative-commons") {
var possible = ["by", "nc", "nd", "sa"];
var enabled = _.filter(possible, function(option) {
@@ -98,16 +98,16 @@
/>
<% } else { %>
<% // must come before icon or else spacing gets messed up %>
- <%= gettext("Creative Commons licensed content, with terms as follow:") %>
+ <%- gettext("Creative Commons licensed content, with terms as follow:") %>
<% _.each(enabled, function(option) { %>
<%- license.options[option.toUpperCase()].name %>
<% }); %>
- <%= gettext("Some Rights Reserved") %>
+ <%- gettext("Some Rights Reserved") %>
<% } %>
<% } else { %>
- <%= typeof licenseString == "string" ? licenseString : "" %>
+ <%- typeof licenseString == "string" ? licenseString : "" %>
<% // Default to ARR license %>
- © <%= gettext("All Rights Reserved") %>
+ © <%- gettext("All Rights Reserved") %>
<% } %>
diff --git a/cms/templates/js/metadata-file-uploader-item.underscore b/cms/templates/js/metadata-file-uploader-item.underscore
index 45e08c1b7b..7c7637c073 100644
--- a/cms/templates/js/metadata-file-uploader-item.underscore
+++ b/cms/templates/js/metadata-file-uploader-item.underscore
@@ -1,3 +1,3 @@
-<%= model.get('value') ? gettext('Replace') : gettext('Upload') %>
-<% if (model.get('value')) { %>" target="_blank" class="download-action download-setting"><%= gettext("Download") %>
+<%- model.get('value') ? gettext('Replace') : gettext('Upload') %>
+<% if (model.get('value')) { %>" rel="noopener" target="_blank" class="download-action download-setting"><%- gettext("Download") %>
<% } %>
diff --git a/cms/templates/textbooks.html b/cms/templates/textbooks.html
index 2a5c955224..7cd12cbc7e 100644
--- a/cms/templates/textbooks.html
+++ b/cms/templates/textbooks.html
@@ -1,9 +1,10 @@
+<%page expression_filter="h"/>
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "textbooks" %>
<%namespace name='static' file='static_content.html'/>
<%!
from django.utils.translation import ugettext as _
-from openedx.core.djangolib.js_utils import dump_js_escaped_json
+from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
%>
<%block name="title">${_("Textbooks")}
@@ -21,9 +22,9 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json
diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py
index 248adfb58b..b439f335ae 100644
--- a/common/lib/xmodule/xmodule/lti_module.py
+++ b/common/lib/xmodule/xmodule/lti_module.py
@@ -80,6 +80,7 @@ from xmodule.editing_module import MetadataOnlyEditingDescriptor
from xmodule.lti_2_util import LTI20ModuleMixin, LTIError
from xmodule.raw_module import EmptyDataRawDescriptor
from xmodule.x_module import XModule, module_attr
+from openedx.core.djangolib.markup import HTML, Text
log = logging.getLogger(__name__)
@@ -87,6 +88,7 @@ DOCS_ANCHOR_TAG_OPEN = (
""
)
+BREAK_TAG = '' # Make '_' a no-op so we can scrape strings. Using lambda instead of # `django.utils.translation.ugettext_noop` because Django cannot be imported in this file @@ -124,39 +126,42 @@ class LTIFields(object): ) lti_id = String( display_name=_("LTI ID"), - help=_( + help=Text(_( "Enter the LTI ID for the external LTI provider. " "This value must be the same LTI ID that you entered in the " "LTI Passports setting on the Advanced Settings page." - "
See {docs_anchor_open}the edX LTI documentation{anchor_close} for more details on this setting." - ).format( - docs_anchor_open=DOCS_ANCHOR_TAG_OPEN, - anchor_close="" + "{break_tag}See {docs_anchor_open}the edX LTI documentation{anchor_close} for more details on this setting." + )).format( + break_tag=HTML(BREAK_TAG), + docs_anchor_open=HTML(DOCS_ANCHOR_TAG_OPEN), + anchor_close=HTML("") ), default='', scope=Scope.settings ) launch_url = String( display_name=_("LTI URL"), - help=_( + help=Text(_( "Enter the URL of the external tool that this component launches. " "This setting is only used when Hide External Tool is set to False." - "
See {docs_anchor_open}the edX LTI documentation{anchor_close} for more details on this setting." - ).format( - docs_anchor_open=DOCS_ANCHOR_TAG_OPEN, - anchor_close="" + "{break_tag}See {docs_anchor_open}the edX LTI documentation{anchor_close} for more details on this setting." + )).format( + break_tag=HTML(BREAK_TAG), + docs_anchor_open=HTML(DOCS_ANCHOR_TAG_OPEN), + anchor_close=HTML("") ), default='http://www.example.com', scope=Scope.settings) custom_parameters = List( display_name=_("Custom Parameters"), - help=_( + help=Text(_( "Add the key/value pair for any custom parameters, such as the page your e-book should open to or " "the background color for this component." - "
See {docs_anchor_open}the edX LTI documentation{anchor_close} for more details on this setting." - ).format( - docs_anchor_open=DOCS_ANCHOR_TAG_OPEN, - anchor_close="" + "{break_tag}See {docs_anchor_open}the edX LTI documentation{anchor_close} for more details on this setting." + )).format( + break_tag=HTML(BREAK_TAG), + docs_anchor_open=HTML(DOCS_ANCHOR_TAG_OPEN), + anchor_close=HTML("") ), scope=Scope.settings) open_in_a_new_page = Boolean( diff --git a/lms/static/js/student_account/views/RegisterView.js b/lms/static/js/student_account/views/RegisterView.js index 9daa4720c7..70191b66e2 100644 --- a/lms/static/js/student_account/views/RegisterView.js +++ b/lms/static/js/student_account/views/RegisterView.js @@ -133,23 +133,24 @@ render: function(html) { var fields = html || '', - formErrorsTitle = gettext('An error occurred.'); + formErrorsTitle = gettext('An error occurred.'), + renderHtml = _.template(this.tpl)({ + /* We pass the context object to the template so that + * we can perform variable interpolation using sprintf + */ + context: { + fields: fields, + currentProvider: this.currentProvider, + syncLearnerProfileData: this.syncLearnerProfileData, + providers: this.providers, + hasSecondaryProviders: this.hasSecondaryProviders, + platformName: this.platformName, + autoRegisterWelcomeMessage: this.autoRegisterWelcomeMessage, + registerFormSubmitButtonText: this.registerFormSubmitButtonText + } + }); - $(this.el).html(_.template(this.tpl)({ - /* We pass the context object to the template so that - * we can perform variable interpolation using sprintf - */ - context: { - fields: fields, - currentProvider: this.currentProvider, - syncLearnerProfileData: this.syncLearnerProfileData, - providers: this.providers, - hasSecondaryProviders: this.hasSecondaryProviders, - platformName: this.platformName, - autoRegisterWelcomeMessage: this.autoRegisterWelcomeMessage, - registerFormSubmitButtonText: this.registerFormSubmitButtonText - } - })); + HtmlUtils.setHtml($(this.el), HtmlUtils.HTML(renderHtml)); this.postRender(); diff --git a/lms/templates/api_admin/catalogs/edit.html b/lms/templates/api_admin/catalogs/edit.html index a12dca712b..713fd6b805 100644 --- a/lms/templates/api_admin/catalogs/edit.html +++ b/lms/templates/api_admin/catalogs/edit.html @@ -4,6 +4,7 @@ <%! from django.urls import reverse from django.utils.translation import ugettext as _ +from openedx.core.djangolib.js_utils import js_escaped_string %> <%namespace name='static' file='/static_content.html'/> @@ -13,8 +14,8 @@ from django.utils.translation import ugettext as _ <%block name="js_extra"> <%static:require_module module_name="js/api_admin/catalog_preview_factory" class_name="CatalogPreviewFactory"> CatalogPreviewFactory({ - previewUrl: "${preview_url}", - catalogApiUrl: "${catalog_api_url}", + previewUrl: "${preview_url | n, js_escaped_string}", + catalogApiUrl: "${catalog_api_url | n, js_escaped_string}", }); @@ -37,7 +38,7 @@ from django.utils.translation import ugettext as _ - ${form.as_p() | n} + ${form.as_p() | n, decode.utf8}
-
-
- ${_('Required fields are noted by bold text and an asterisk (*).')} + ${Text(_('Required fields are noted by {strong_indicator}bold text and an asterisk (*).{strong_close}')).format( + strong_indicator=HTML(''), + strong_close=HTML('') + )}
- + +