Skip to content

E
edx-platform
Commit f5a63b1e by Robert Raposa
Options

Merge pull request #10962 from edx/robrap/TNL-3425 

Deprecate escaping in display_name_with_default
parents 62597a17 5e69224c
Showing with 257 additions and 173 deletions
cms/djangoapps/contentstore/views/item.py
...@@ -834,7 +834,7 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F ...@@ -834,7 +834,7 @@ def create_xblock_info(xblock, data=None, metadata=None, include_ancestor_info=F
xblock_info = { xblock_info = {
"id": unicode(xblock.location), "id": unicode(xblock.location),
"display_name": xblock.display_name_with_default, "display_name": xblock.display_name_with_default_escaped,
"category": xblock.category, "category": xblock.category,
"edited_on": get_default_time_display(xblock.subtree_edited_on) if xblock.subtree_edited_on else None, "edited_on": get_default_time_display(xblock.subtree_edited_on) if xblock.subtree_edited_on else None,
"published": published, "published": published,
...@@ -1098,4 +1098,4 @@ def _xblock_type_and_display_name(xblock): ...@@ -1098,4 +1098,4 @@ def _xblock_type_and_display_name(xblock):
""" """
return _('{section_or_subsection} "{display_name}"').format( return _('{section_or_subsection} "{display_name}"').format(
section_or_subsection=xblock_type_display_name(xblock), section_or_subsection=xblock_type_display_name(xblock),
display_name=xblock.display_name_with_default) display_name=xblock.display_name_with_default_escaped)
cms/templates/base.html
...@@ -16,9 +16,9 @@ from openedx.core.lib.js_utils import ( ...@@ -16,9 +16,9 @@ from openedx.core.lib.js_utils import (
<%block name="title"></%block> | <%block name="title"></%block> |
% if context_course: % if context_course:
<% ctx_loc = context_course.location %> <% ctx_loc = context_course.location %>
${context_course.display_name_with_default | h} | ${context_course.display_name_with_default_escaped | h} |
% elif context_library: % elif context_library:
${context_library.display_name_with_default | h} | ${context_library.display_name_with_default_escaped | h} |
% endif % endif
${settings.STUDIO_NAME} ${settings.STUDIO_NAME}
</title> </title>
...@@ -81,7 +81,7 @@ from openedx.core.lib.js_utils import ( ...@@ -81,7 +81,7 @@ from openedx.core.lib.js_utils import (
require(['js/factories/course'], function(CourseFactory) { require(['js/factories/course'], function(CourseFactory) {
CourseFactory({ CourseFactory({
id: "${escape_js_string(context_course.id) | n}", id: "${escape_js_string(context_course.id) | n}",
name: "${context_course.display_name_with_default | h}", name: "${context_course.display_name_with_default_escaped | h}",
url_name: "${context_course.location.name | h}", url_name: "${context_course.location.name | h}",
org: "${context_course.location.org | h}", org: "${context_course.location.org | h}",
num: "${context_course.location.course | h}", num: "${context_course.location.course | h}",
......
cms/templates/container.html
...@@ -12,7 +12,7 @@ from contentstore.views.helpers import xblock_studio_url, xblock_type_display_na ...@@ -12,7 +12,7 @@ from contentstore.views.helpers import xblock_studio_url, xblock_type_display_na
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from openedx.core.lib.js_utils import escape_json_dumps from openedx.core.lib.js_utils import escape_json_dumps
%> %>
<%block name="title">${xblock.display_name_with_default} ${xblock_type_display_name(xblock) | h}</%block> <%block name="title">${xblock.display_name_with_default_escaped} ${xblock_type_display_name(xblock) | h}</%block>
<%block name="bodyclass">is-signedin course container view-container</%block> <%block name="bodyclass">is-signedin course container view-container</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
...@@ -55,15 +55,15 @@ from openedx.core.lib.js_utils import escape_json_dumps ...@@ -55,15 +55,15 @@ from openedx.core.lib.js_utils import escape_json_dumps
ancestor_url = xblock_studio_url(ancestor) ancestor_url = xblock_studio_url(ancestor)
%> %>
% if ancestor_url: % if ancestor_url:
<a href="${ancestor_url | h}" class="navigation-item navigation-link navigation-parent">${ancestor.display_name_with_default | h}</a> <a href="${ancestor_url | h}" class="navigation-item navigation-link navigation-parent">${ancestor.display_name_with_default_escaped | h}</a>
% else: % else:
<span class="navigation-item navigation-parent">${ancestor.display_name_with_default | h}</span> <span class="navigation-item navigation-parent">${ancestor.display_name_with_default_escaped | h}</span>
% endif % endif
% endfor % endfor
</small> </small>
<div class="wrapper-xblock-field incontext-editor is-editable" <div class="wrapper-xblock-field incontext-editor is-editable"
data-field="display_name" data-field-display-name="${_("Display Name")}"> data-field="display_name" data-field-display-name="${_("Display Name")}">
<h1 class="page-header-title xblock-field-value incontext-editor-value"><span class="title-value">${xblock.display_name_with_default | h}</span></h1> <h1 class="page-header-title xblock-field-value incontext-editor-value"><span class="title-value">${xblock.display_name_with_default_escaped | h}</span></h1>
</div> </div>
</div> </div>
......
cms/templates/library.html
...@@ -5,7 +5,7 @@ from contentstore.views.helpers import xblock_studio_url, xblock_type_display_na ...@@ -5,7 +5,7 @@ from contentstore.views.helpers import xblock_studio_url, xblock_type_display_na
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from openedx.core.lib.js_utils import escape_json_dumps from openedx.core.lib.js_utils import escape_json_dumps
%> %>
<%block name="title">${context_library.display_name_with_default} ${xblock_type_display_name(context_library)}</%block> <%block name="title">${context_library.display_name_with_default_escaped} ${xblock_type_display_name(context_library)}</%block>
<%block name="bodyclass">is-signedin course container view-container view-library</%block> <%block name="bodyclass">is-signedin course container view-container view-library</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
...@@ -45,7 +45,7 @@ from openedx.core.lib.js_utils import escape_json_dumps ...@@ -45,7 +45,7 @@ from openedx.core.lib.js_utils import escape_json_dumps
<small class="subtitle">${_("Content Library")}</small> <small class="subtitle">${_("Content Library")}</small>
<div class="wrapper-xblock-field incontext-editor is-editable" <div class="wrapper-xblock-field incontext-editor is-editable"
data-field="display_name" data-field-display-name="${_("Display Name")}"> data-field="display_name" data-field-display-name="${_("Display Name")}">
<h1 class="page-header-title xblock-field-value incontext-editor-value"><span class="title-value">${context_library.display_name_with_default}</span></h1> <h1 class="page-header-title xblock-field-value incontext-editor-value"><span class="title-value">${context_library.display_name_with_default_escaped}</span></h1>
</div> </div>
</div> </div>
......
cms/templates/manage_users_lib.html
...@@ -107,7 +107,7 @@ from openedx.core.lib.js_utils import escape_json_dumps ...@@ -107,7 +107,7 @@ from openedx.core.lib.js_utils import escape_json_dumps
<%block name="requirejs"> <%block name="requirejs">
require(["js/factories/manage_users_lib"], function(ManageLibraryUsersFactory) { require(["js/factories/manage_users_lib"], function(ManageLibraryUsersFactory) {
ManageLibraryUsersFactory( ManageLibraryUsersFactory(
"${context_library.display_name_with_default | h}", "${context_library.display_name_with_default_escaped | h}",
${escape_json_dumps(users) | n}, ${escape_json_dumps(users) | n},
"${reverse('contentstore.views.course_team_handler', kwargs={'course_key_string': library_key, 'email': '@@EMAIL@@'})}", "${reverse('contentstore.views.course_team_handler', kwargs={'course_key_string': library_key, 'email': '@@EMAIL@@'})}",
${ request.user.id }, ${ request.user.id },
......
cms/templates/settings.html
...@@ -89,10 +89,10 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}'; ...@@ -89,10 +89,10 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
<li class="action-item"> <li class="action-item">
<% <%
email_subject = urllib.quote(_("Enroll in {course_display_name}").format( email_subject = urllib.quote(_("Enroll in {course_display_name}").format(
course_display_name = context_course.display_name_with_default course_display_name = context_course.display_name_with_default_escaped
).encode("utf-8")) ).encode("utf-8"))
email_body = urllib.quote(_('The course "{course_display_name}", provided by {platform_name}, is open for enrollment. Please navigate to this course at {link_for_about_page} to enroll.').format( email_body = urllib.quote(_('The course "{course_display_name}", provided by {platform_name}, is open for enrollment. Please navigate to this course at {link_for_about_page} to enroll.').format(
course_display_name = context_course.display_name_with_default, course_display_name = context_course.display_name_with_default_escaped,
platform_name = settings.PLATFORM_NAME, platform_name = settings.PLATFORM_NAME,
link_for_about_page = link_for_about_page link_for_about_page = link_for_about_page
).encode("utf-8")) ).encode("utf-8"))
......
cms/templates/studio_xblock_wrapper.html
...@@ -9,7 +9,7 @@ xblock_url = xblock_studio_url(xblock) ...@@ -9,7 +9,7 @@ xblock_url = xblock_studio_url(xblock)
show_inline = xblock.has_children and not xblock_url show_inline = xblock.has_children and not xblock_url
section_class = "level-nesting" if show_inline else "level-element" section_class = "level-nesting" if show_inline else "level-element"
collapsible_class = "is-collapsible" if xblock.has_children else "" collapsible_class = "is-collapsible" if xblock.has_children else ""
label = xblock.display_name_with_default or xblock.scope_ids.block_type label = xblock.display_name_with_default_escaped or xblock.scope_ids.block_type
messages = xblock.validate().to_json() messages = xblock.validate().to_json()
%> %>
......
cms/templates/widgets/header.html
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<span class="sr">${_("Current Course:")}</span> <span class="sr">${_("Current Course:")}</span>
<a class="course-link" href="${index_url}"> <a class="course-link" href="${index_url}">
<span class="course-org">${context_course.display_org_with_default | h}</span><span class="course-number">${context_course.display_number_with_default | h}</span> <span class="course-org">${context_course.display_org_with_default | h}</span><span class="course-number">${context_course.display_number_with_default | h}</span>
<span class="course-title" title="${context_course.display_name_with_default}">${context_course.display_name_with_default}</span> <span class="course-title" title="${context_course.display_name_with_default_escaped}">${context_course.display_name_with_default_escaped}</span>
</a> </a>
</h2> </h2>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<span class="sr">${_("Current Library:")}</span> <span class="sr">${_("Current Library:")}</span>
<a class="course-link" href="${index_url}"> <a class="course-link" href="${index_url}">
<span class="course-org">${context_library.display_org_with_default | h}</span><span class="course-number">${context_library.display_number_with_default | h}</span> <span class="course-org">${context_library.display_org_with_default | h}</span><span class="course-number">${context_library.display_number_with_default | h}</span>
<span class="course-title" title="${context_library.display_name_with_default}">${context_library.display_name_with_default}</span> <span class="course-title" title="${context_library.display_name_with_default_escaped}">${context_library.display_name_with_default_escaped}</span>
</a> </a>
</h2> </h2>
......
common/djangoapps/course_modes/views.py
...@@ -120,7 +120,7 @@ class ChooseModeView(View): ...@@ -120,7 +120,7 @@ class ChooseModeView(View):
"course_modes_choose_url": reverse("course_modes_choose", kwargs={'course_id': course_key.to_deprecated_string()}), "course_modes_choose_url": reverse("course_modes_choose", kwargs={'course_id': course_key.to_deprecated_string()}),
"modes": modes, "modes": modes,
"has_credit_upsell": has_credit_upsell, "has_credit_upsell": has_credit_upsell,
"course_name": course.display_name_with_default, "course_name": course.display_name_with_default_escaped,
"course_org": course.display_org_with_default, "course_org": course.display_org_with_default,
"course_num": course.display_number_with_default, "course_num": course.display_number_with_default,
"chosen_price": chosen_price, "chosen_price": chosen_price,
......
common/lib/xmodule/xmodule/annotatable_module.py
...@@ -150,7 +150,7 @@ class AnnotatableModule(AnnotatableFields, XModule): ...@@ -150,7 +150,7 @@ class AnnotatableModule(AnnotatableFields, XModule):
def get_html(self): def get_html(self):
""" Renders parameters to template. """ """ Renders parameters to template. """
context = { context = {
'display_name': self.display_name_with_default, 'display_name': self.display_name_with_default_escaped,
'element_id': self.element_id, 'element_id': self.element_id,
'instructions_html': self.instructions, 'instructions_html': self.instructions,
'content_html': self._render_content() 'content_html': self._render_content()
......
common/lib/xmodule/xmodule/capa_base.py
...@@ -658,7 +658,7 @@ class CapaMixin(CapaFields): ...@@ -658,7 +658,7 @@ class CapaMixin(CapaFields):
check_button_checking = False check_button_checking = False
content = { content = {
'name': self.display_name_with_default, 'name': self.display_name_with_default_escaped,
'html': html, 'html': html,
'weight': self.weight, 'weight': self.weight,
} }
......
common/lib/xmodule/xmodule/course_metadata_utils.py
...@@ -57,15 +57,51 @@ def display_name_with_default(course): ...@@ -57,15 +57,51 @@ def display_name_with_default(course):
like to just pass course.display_name and course.url_name as arguments to like to just pass course.display_name and course.url_name as arguments to
this function, we can't do so without breaking those tests. this function, we can't do so without breaking those tests.
Note: This method no longer escapes as it once did, so the caller must
ensure it is properly escaped where necessary.
Arguments: Arguments:
course (CourseDescriptor|CourseOverview): descriptor or overview of course (CourseDescriptor|CourseOverview): descriptor or overview of
said course. said course.
""" """
# TODO: Consider changing this to use something like xml.sax.saxutils.escape
return ( return (
course.display_name if course.display_name is not None course.display_name if course.display_name is not None
else course.url_name.replace('_', ' ') else course.url_name.replace('_', ' ')
).replace('<', '&lt;').replace('>', '&gt;') )
def display_name_with_default_escaped(course):
"""
DEPRECATED: use display_name_with_default
Calculates the display name for a course with some HTML escaping.
This follows the same logic as display_name_with_default, with
the addition of the escaping.
Here is an example of how to move away from this method in Mako html:
Before:
<span class="course-name">${course.display_name_with_default_escaped}</span>
After:
<span class="course-name">${course.display_name_with_default | h}</span>
If the context is Javascript in Mako, you'll need to follow other best practices.
Note: Switch to display_name_with_default, and ensure the caller
properly escapes where necessary.
Note: This newly introduced method should not be used. It was only
introduced to enable a quick search/replace and the ability to slowly
migrate and test switching to display_name_with_default, which is no
longer escaped.
Arguments:
course (CourseDescriptor|CourseOverview): descriptor or overview of
said course.
"""
# This escaping is incomplete. However, rather than switching this to use
# markupsafe.escape() and fixing issues, better to put that energy toward
# migrating away from this method altogether.
return course.display_name_with_default.replace('<', '&lt;').replace('>', '&gt;')
def number_for_course_location(location): def number_for_course_location(location):
......
common/lib/xmodule/xmodule/imageannotation_module.py
...@@ -127,7 +127,7 @@ class ImageAnnotationModule(AnnotatableFields, XModule): ...@@ -127,7 +127,7 @@ class ImageAnnotationModule(AnnotatableFields, XModule):
def student_view(self, context): def student_view(self, context):
""" Renders parameters to template. """ """ Renders parameters to template. """
context = { context = {
'display_name': self.display_name_with_default, 'display_name': self.display_name_with_default_escaped,
'instructions_html': self.instructions, 'instructions_html': self.instructions,
'token': retrieve_token(self.user_email, self.annotation_token_secret), 'token': retrieve_token(self.user_email, self.annotation_token_secret),
'tag': self.instructor_tags, 'tag': self.instructor_tags,
......
common/lib/xmodule/xmodule/seq_module.py
...@@ -224,7 +224,7 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule): ...@@ -224,7 +224,7 @@ class SequenceModule(SequenceFields, ProctoringFields, XModule):
'path': " > ".join(display_names + [child.display_name or '']), 'path': " > ".join(display_names + [child.display_name or '']),
} }
if childinfo['title'] == '': if childinfo['title'] == '':
childinfo['title'] = child.display_name_with_default childinfo['title'] = child.display_name_with_default_escaped
contents.append(childinfo) contents.append(childinfo)
params = { params = {
......
common/lib/xmodule/xmodule/tests/test_course_metadata_utils.py
...@@ -11,6 +11,7 @@ from xmodule.course_metadata_utils import ( ...@@ -11,6 +11,7 @@ from xmodule.course_metadata_utils import (
clean_course_key, clean_course_key,
url_name_for_course_location, url_name_for_course_location,
display_name_with_default, display_name_with_default,
display_name_with_default_escaped,
number_for_course_location, number_for_course_location,
has_course_started, has_course_started,
has_course_ended, has_course_ended,
...@@ -133,12 +134,18 @@ class CourseMetadataUtilsTestCase(TestCase): ...@@ -133,12 +134,18 @@ class CourseMetadataUtilsTestCase(TestCase):
TestScenario((self.demo_course.location,), self.demo_course.location.name), TestScenario((self.demo_course.location,), self.demo_course.location.name),
TestScenario((self.html_course.location,), self.html_course.location.name), TestScenario((self.html_course.location,), self.html_course.location.name),
]), ]),
FunctionTest(display_name_with_default, [ FunctionTest(display_name_with_default_escaped, [
# Test course with no display name. # Test course with no display name.
TestScenario((self.demo_course,), "Empty"), TestScenario((self.demo_course,), "Empty"),
# Test course with a display name that contains characters that need escaping. # Test course with a display name that contains characters that need escaping.
TestScenario((self.html_course,), "Intro to &lt;html&gt;"), TestScenario((self.html_course,), "Intro to &lt;html&gt;"),
]), ]),
FunctionTest(display_name_with_default, [
# Test course with no display name.
TestScenario((self.demo_course,), "Empty"),
# Test course with a display name that contains characters that need escaping.
TestScenario((self.html_course,), "Intro to <html>"),
]),
FunctionTest(number_for_course_location, [ FunctionTest(number_for_course_location, [
TestScenario((self.demo_course.location,), "DemoX.1"), TestScenario((self.demo_course.location,), "DemoX.1"),
TestScenario((self.html_course.location,), "CS-203"), TestScenario((self.html_course.location,), "CS-203"),
......
common/lib/xmodule/xmodule/textannotation_module.py
...@@ -121,7 +121,7 @@ class TextAnnotationModule(AnnotatableFields, XModule): ...@@ -121,7 +121,7 @@ class TextAnnotationModule(AnnotatableFields, XModule):
""" Renders parameters to template. """ """ Renders parameters to template. """
context = { context = {
'course_key': self.runtime.course_id, 'course_key': self.runtime.course_id,
'display_name': self.display_name_with_default, 'display_name': self.display_name_with_default_escaped,
'tag': self.instructor_tags, 'tag': self.instructor_tags,
'source': self.source, 'source': self.source,
'instructions_html': self.instructions, 'instructions_html': self.instructions,
......
common/lib/xmodule/xmodule/video_module/video_module.py
...@@ -334,7 +334,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers, ...@@ -334,7 +334,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
'cdn_eval': cdn_eval, 'cdn_eval': cdn_eval,
'cdn_exp_group': cdn_exp_group, 'cdn_exp_group': cdn_exp_group,
'id': self.location.html_id(), 'id': self.location.html_id(),
'display_name': self.display_name_with_default, 'display_name': self.display_name_with_default_escaped,
'handout': self.handout, 'handout': self.handout,
'download_video_link': download_video_link, 'download_video_link': download_video_link,
'track': track_url, 'track': track_url,
......
common/lib/xmodule/xmodule/videoannotation_module.py
...@@ -128,7 +128,7 @@ class VideoAnnotationModule(AnnotatableFields, XModule): ...@@ -128,7 +128,7 @@ class VideoAnnotationModule(AnnotatableFields, XModule):
context = { context = {
'course_key': self.runtime.course_id, 'course_key': self.runtime.course_id,
'display_name': self.display_name_with_default, 'display_name': self.display_name_with_default_escaped,
'instructions_html': self.instructions, 'instructions_html': self.instructions,
'sourceUrl': self.sourceurl, 'sourceUrl': self.sourceurl,
'typeSource': extension, 'typeSource': extension,
......
common/lib/xmodule/xmodule/x_module.py
...@@ -349,6 +349,21 @@ class XModuleMixin(XModuleFields, XBlock): ...@@ -349,6 +349,21 @@ class XModuleMixin(XModuleFields, XBlock):
return course_metadata_utils.display_name_with_default(self) return course_metadata_utils.display_name_with_default(self)
@property @property
def display_name_with_default_escaped(self):
"""
DEPRECATED: use display_name_with_default
Return an html escaped display name for the module: use display_name if
defined in metadata, otherwise convert the url name.
Note: This newly introduced method should not be used. It was only
introduced to enable a quick search/replace and the ability to slowly
migrate and test switching to display_name_with_default, which is no
longer escaped.
"""
return course_metadata_utils.display_name_with_default_escaped(self)
@property
def xblock_kvs(self): def xblock_kvs(self):
""" """
Retrieves the internal KeyValueStore for this XModule. Retrieves the internal KeyValueStore for this XModule.
...@@ -424,7 +439,7 @@ class XModuleMixin(XModuleFields, XBlock): ...@@ -424,7 +439,7 @@ class XModuleMixin(XModuleFields, XBlock):
if self.has_children: if self.has_children:
return sum((child.get_content_titles() for child in self.get_children()), []) return sum((child.get_content_titles() for child in self.get_children()), [])
else: else:
return [self.display_name_with_default] return [self.display_name_with_default_escaped]
def get_children(self, usage_id_filter=None, usage_key_filter=None): # pylint: disable=arguments-differ def get_children(self, usage_id_filter=None, usage_key_filter=None): # pylint: disable=arguments-differ
"""Returns a list of XBlock instances for the children of """Returns a list of XBlock instances for the children of
......
common/test/test_microsites/test_microsite/templates/emails/enroll_email_allowedmessage.txt
...@@ -4,7 +4,7 @@ ${_("Dear student,")} ...@@ -4,7 +4,7 @@ ${_("Dear student,")}
${_("You have been invited to join {course_name} at {site_name} by a " ${_("You have been invited to join {course_name} at {site_name} by a "
"member of the course staff.").format( "member of the course staff.").format(
course_name=course.display_name_with_default, course_name=course.display_name_with_default_escaped,
site_name=site_name site_name=site_name
)} )}
...@@ -16,7 +16,7 @@ ${_("To finish your registration, please visit {registration_url} and fill " ...@@ -16,7 +16,7 @@ ${_("To finish your registration, please visit {registration_url} and fill "
% if auto_enroll: % if auto_enroll:
${_("Once you have registered and activated your account, you will see " ${_("Once you have registered and activated your account, you will see "
"{course_name} listed on your dashboard.").format( "{course_name} listed on your dashboard.").format(
course_name=course.display_name_with_default course_name=course.display_name_with_default_escaped
)} )}
% else: % else:
${_("Once you have registered and activated your account, visit {course_about_url} " ${_("Once you have registered and activated your account, visit {course_about_url} "
......
common/test/test_microsites/test_microsite/templates/emails/enroll_email_allowedsubject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to register for {course_name}").format( ${_("You have been invited to register for {course_name}").format(
course_name=course.display_name_with_default course_name=course.display_name_with_default_escaped
)} )}
\ No newline at end of file
common/test/test_microsites/test_microsite/templates/emails/enroll_email_enrolledmessage.txt
...@@ -5,7 +5,7 @@ ${_("Dear {full_name}").format(full_name=full_name)} ...@@ -5,7 +5,7 @@ ${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been enrolled in {course_name} at {site_name} by a member " ${_("You have been enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course should now appear on your {site_name} " "of the course staff. The course should now appear on your {site_name} "
"dashboard.").format( "dashboard.").format(
course_name=course.display_name_with_default, course_name=course.display_name_with_default_escaped,
site_name=site_name site_name=site_name
)} )}
......
common/test/test_microsites/test_microsite/templates/emails/enroll_email_enrolledsubject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been enrolled in {course_name}").format( ${_("You have been enrolled in {course_name}").format(
course_name=course.display_name_with_default course_name=course.display_name_with_default_escaped
)} )}
\ No newline at end of file
common/test/test_microsites/test_microsite/templates/emails/unenroll_email_allowedmessage.txt
...@@ -4,7 +4,7 @@ ${_("Dear Student,")} ...@@ -4,7 +4,7 @@ ${_("Dear Student,")}
${_("You have been un-enrolled from course {course_name} by a member " ${_("You have been un-enrolled from course {course_name} by a member "
"of the course staff. Please disregard the invitation " "of the course staff. Please disregard the invitation "
"previously sent.").format(course_name=course.display_name_with_default)} "previously sent.").format(course_name=course.display_name_with_default_escaped)}
---- ----
${_("This email was automatically sent from {site_name} " ${_("This email was automatically sent from {site_name} "
......
common/test/test_microsites/test_microsite/templates/emails/unenroll_email_enrolledmessage.txt
...@@ -5,13 +5,13 @@ ${_("Dear {full_name}").format(full_name=full_name)} ...@@ -5,13 +5,13 @@ ${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been un-enrolled in {course_name} at {site_name} by a member " ${_("You have been un-enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course will no longer appear on your " "of the course staff. The course will no longer appear on your "
"{site_name} dashboard.").format( "{site_name} dashboard.").format(
course_name=course.display_name_with_default, site_name=site_name course_name=course.display_name_with_default_escaped, site_name=site_name
)} )}
${_("Your other courses have not been affected.")} ${_("Your other courses have not been affected.")}
---- ----
${_("This email was automatically sent from {site_name} to " ${_("This email was automatically sent from {site_name} to "
"{full_name}").format( "{full_name}").format(
full_name=full_name, site_name=site_name full_name=full_name, site_name=site_name
)} )}
\ No newline at end of file
common/test/test_microsites/test_microsite/templates/emails/unenroll_email_subject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been un-enrolled from {course_name}").format( ${_("You have been un-enrolled from {course_name}").format(
course_name=course.display_name_with_default course_name=course.display_name_with_default_escaped
)} )}
\ No newline at end of file
lms/djangoapps/course_api/serializers.py
...@@ -39,7 +39,7 @@ class CourseSerializer(serializers.Serializer): # pylint: disable=abstract-meth ...@@ -39,7 +39,7 @@ class CourseSerializer(serializers.Serializer): # pylint: disable=abstract-meth
""" """
course_id = serializers.CharField(source='id', read_only=True) course_id = serializers.CharField(source='id', read_only=True)
name = serializers.CharField(source='display_name_with_default') name = serializers.CharField(source='display_name_with_default_escaped')
number = serializers.CharField(source='display_number_with_default') number = serializers.CharField(source='display_number_with_default')
org = serializers.CharField(source='display_org_with_default') org = serializers.CharField(source='display_org_with_default')
short_description = serializers.CharField() short_description = serializers.CharField()
......
lms/djangoapps/course_wiki/views.py
...@@ -89,7 +89,7 @@ def course_wiki_redirect(request, course_id): # pylint: disable=unused-argument ...@@ -89,7 +89,7 @@ def course_wiki_redirect(request, course_id): # pylint: disable=unused-argument
# Translators: this string includes wiki markup. Leave the ** and the _ alone. # Translators: this string includes wiki markup. Leave the ** and the _ alone.
_("This is the wiki for **{organization}**'s _{course_name}_.").format( _("This is the wiki for **{organization}**'s _{course_name}_.").format(
organization=course.display_org_with_default, organization=course.display_org_with_default,
course_name=course.display_name_with_default, course_name=course.display_name_with_default_escaped,
) )
) )
urlpath = URLPath.create_article( urlpath = URLPath.create_article(
......
lms/djangoapps/courseware/features/common.py
...@@ -223,9 +223,9 @@ def get_courseware_with_tabs(course_id): ...@@ -223,9 +223,9 @@ def get_courseware_with_tabs(course_id):
course = get_course_by_id(course_id) course = get_course_by_id(course_id)
chapters = [chapter for chapter in course.get_children() if not chapter.hide_from_toc] chapters = [chapter for chapter in course.get_children() if not chapter.hide_from_toc]
courseware = [{ courseware = [{
'chapter_name': c.display_name_with_default, 'chapter_name': c.display_name_with_default_escaped,
'sections': [{ 'sections': [{
'section_name': s.display_name_with_default, 'section_name': s.display_name_with_default_escaped,
'clickable_tab_count': len(s.get_children()) if (type(s) == seq_module.SequenceDescriptor) else 0, 'clickable_tab_count': len(s.get_children()) if (type(s) == seq_module.SequenceDescriptor) else 0,
'tabs': [{ 'tabs': [{
'children_count': len(t.get_children()) if (type(t) == vertical_block.VerticalBlock) else 0, 'children_count': len(t.get_children()) if (type(t) == vertical_block.VerticalBlock) else 0,
......
lms/djangoapps/courseware/grades.py
...@@ -247,7 +247,7 @@ def answer_distributions(course_key): ...@@ -247,7 +247,7 @@ def answer_distributions(course_key):
problem_store = modulestore() problem_store = modulestore()
if usage_key not in state_keys_to_problem_info: if usage_key not in state_keys_to_problem_info:
problem = problem_store.get_item(usage_key) problem = problem_store.get_item(usage_key)
problem_info = (problem.url_name, problem.display_name_with_default) problem_info = (problem.url_name, problem.display_name_with_default_escaped)
state_keys_to_problem_info[usage_key] = problem_info state_keys_to_problem_info[usage_key] = problem_info
return state_keys_to_problem_info[usage_key] return state_keys_to_problem_info[usage_key]
...@@ -374,7 +374,7 @@ def _grade(student, request, course, keep_raw_scores, field_data_cache, scores_c ...@@ -374,7 +374,7 @@ def _grade(student, request, course, keep_raw_scores, field_data_cache, scores_c
format_scores = [] format_scores = []
for section in sections: for section in sections:
section_descriptor = section['section_descriptor'] section_descriptor = section['section_descriptor']
section_name = section_descriptor.display_name_with_default section_name = section_descriptor.display_name_with_default_escaped
with outer_atomic(): with outer_atomic():
# some problems have state that is updated independently of interaction # some problems have state that is updated independently of interaction
...@@ -449,7 +449,7 @@ def _grade(student, request, course, keep_raw_scores, field_data_cache, scores_c ...@@ -449,7 +449,7 @@ def _grade(student, request, course, keep_raw_scores, field_data_cache, scores_c
correct, correct,
total, total,
graded, graded,
module_descriptor.display_name_with_default, module_descriptor.display_name_with_default_escaped,
module_descriptor.location module_descriptor.location
) )
) )
...@@ -629,7 +629,7 @@ def _progress_summary(student, request, course, field_data_cache=None, scores_cl ...@@ -629,7 +629,7 @@ def _progress_summary(student, request, course, field_data_cache=None, scores_cl
correct, correct,
total, total,
graded, graded,
module_descriptor.display_name_with_default, module_descriptor.display_name_with_default_escaped,
module_descriptor.location module_descriptor.location
) )
...@@ -638,11 +638,11 @@ def _progress_summary(student, request, course, field_data_cache=None, scores_cl ...@@ -638,11 +638,11 @@ def _progress_summary(student, request, course, field_data_cache=None, scores_cl
scores.reverse() scores.reverse()
section_total, _ = graders.aggregate_scores( section_total, _ = graders.aggregate_scores(
scores, section_module.display_name_with_default) scores, section_module.display_name_with_default_escaped)
module_format = section_module.format if section_module.format is not None else '' module_format = section_module.format if section_module.format is not None else ''
sections.append({ sections.append({
'display_name': section_module.display_name_with_default, 'display_name': section_module.display_name_with_default_escaped,
'url_name': section_module.url_name, 'url_name': section_module.url_name,
'scores': scores, 'scores': scores,
'section_total': section_total, 'section_total': section_total,
...@@ -652,8 +652,8 @@ def _progress_summary(student, request, course, field_data_cache=None, scores_cl ...@@ -652,8 +652,8 @@ def _progress_summary(student, request, course, field_data_cache=None, scores_cl
}) })
chapters.append({ chapters.append({
'course': course.display_name_with_default, 'course': course.display_name_with_default_escaped,
'display_name': chapter_module.display_name_with_default, 'display_name': chapter_module.display_name_with_default_escaped,
'url_name': chapter_module.url_name, 'url_name': chapter_module.url_name,
'sections': sections 'sections': sections
}) })
......
lms/djangoapps/courseware/module_render.py
...@@ -166,7 +166,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_ ...@@ -166,7 +166,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_
for chapter in chapters: for chapter in chapters:
# Only show required content, if there is required content # Only show required content, if there is required content
# chapter.hide_from_toc is read-only (boo) # chapter.hide_from_toc is read-only (boo)
display_id = slugify(chapter.display_name_with_default) display_id = slugify(chapter.display_name_with_default_escaped)
local_hide_from_toc = False local_hide_from_toc = False
if required_content: if required_content:
if unicode(chapter.location) not in required_content: if unicode(chapter.location) not in required_content:
...@@ -184,7 +184,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_ ...@@ -184,7 +184,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_
if not section.hide_from_toc: if not section.hide_from_toc:
section_context = { section_context = {
'display_name': section.display_name_with_default, 'display_name': section.display_name_with_default_escaped,
'url_name': section.url_name, 'url_name': section.url_name,
'format': section.format if section.format is not None else '', 'format': section.format if section.format is not None else '',
'due': section.due, 'due': section.due,
...@@ -247,7 +247,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_ ...@@ -247,7 +247,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_
sections.append(section_context) sections.append(section_context)
toc_chapters.append({ toc_chapters.append({
'display_name': chapter.display_name_with_default, 'display_name': chapter.display_name_with_default_escaped,
'display_id': display_id, 'display_id': display_id,
'url_name': chapter.url_name, 'url_name': chapter.url_name,
'sections': sections, 'sections': sections,
...@@ -941,7 +941,7 @@ def get_module_by_usage_id(request, course_id, usage_id, disable_staff_debug_inf ...@@ -941,7 +941,7 @@ def get_module_by_usage_id(request, course_id, usage_id, disable_staff_debug_inf
tracking_context = { tracking_context = {
'module': { 'module': {
'display_name': descriptor.display_name_with_default, 'display_name': descriptor.display_name_with_default_escaped,
'usage_key': unicode(descriptor.location), 'usage_key': unicode(descriptor.location),
} }
} }
......
lms/djangoapps/courseware/views.py
...@@ -427,7 +427,7 @@ def _index_bulk_op(request, course_key, chapter, section, position): ...@@ -427,7 +427,7 @@ def _index_bulk_op(request, course_key, chapter, section, position):
context = { context = {
'csrf': csrf(request)['csrf_token'], 'csrf': csrf(request)['csrf_token'],
'accordion': render_accordion(user, request, course, chapter, section, field_data_cache), 'accordion': render_accordion(user, request, course, chapter, section, field_data_cache),
'COURSE_TITLE': course.display_name_with_default, 'COURSE_TITLE': course.display_name_with_default_escaped,
'course': course, 'course': course,
'init': '', 'init': '',
'fragment': Fragment(), 'fragment': Fragment(),
...@@ -539,7 +539,7 @@ def _index_bulk_op(request, course_key, chapter, section, position): ...@@ -539,7 +539,7 @@ def _index_bulk_op(request, course_key, chapter, section, position):
save_child_position(chapter_module, section) save_child_position(chapter_module, section)
section_render_context = {'activate_block_id': request.GET.get('activate_block_id')} section_render_context = {'activate_block_id': request.GET.get('activate_block_id')}
context['fragment'] = section_module.render(STUDENT_VIEW, section_render_context) context['fragment'] = section_module.render(STUDENT_VIEW, section_render_context)
context['section_title'] = section_descriptor.display_name_with_default context['section_title'] = section_descriptor.display_name_with_default_escaped
else: else:
# section is none, so display a message # section is none, so display a message
studio_url = get_studio_url(course, 'course') studio_url = get_studio_url(course, 'course')
......
lms/djangoapps/edxnotes/helpers.py
...@@ -207,7 +207,7 @@ def get_module_context(course, item): ...@@ -207,7 +207,7 @@ def get_module_context(course, item):
""" """
item_dict = { item_dict = {
'location': unicode(item.location), 'location': unicode(item.location),
'display_name': item.display_name_with_default, 'display_name': item.display_name_with_default_escaped,
} }
if item.category == 'chapter' and item.get_parent(): if item.category == 'chapter' and item.get_parent():
# course is a locator w/o branch and version # course is a locator w/o branch and version
...@@ -328,7 +328,7 @@ def get_course_position(course_module): ...@@ -328,7 +328,7 @@ def get_course_position(course_module):
urlargs['chapter'] = chapter.url_name urlargs['chapter'] = chapter.url_name
if course_module.position is not None: if course_module.position is not None:
return { return {
'display_name': chapter.display_name_with_default, 'display_name': chapter.display_name_with_default_escaped,
'url': reverse('courseware_chapter', kwargs=urlargs), 'url': reverse('courseware_chapter', kwargs=urlargs),
} }
...@@ -340,7 +340,7 @@ def get_course_position(course_module): ...@@ -340,7 +340,7 @@ def get_course_position(course_module):
urlargs['section'] = section.url_name urlargs['section'] = section.url_name
return { return {
'display_name': section.display_name_with_default, 'display_name': section.display_name_with_default_escaped,
'url': reverse('courseware_section', kwargs=urlargs) 'url': reverse('courseware_section', kwargs=urlargs)
} }
......
lms/djangoapps/edxnotes/tests.py
...@@ -301,19 +301,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -301,19 +301,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"quote text", u"quote": u"quote text",
u"text": u"text", u"text": u"text",
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)] u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)]
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_2.location), u"usage_id": unicode(self.html_module_2.location),
...@@ -323,13 +323,13 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -323,13 +323,13 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"quote text", u"quote": u"quote text",
u"text": u"text", u"text": u"text",
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [ u"children": [
unicode(self.vertical.location), unicode(self.vertical.location),
...@@ -337,7 +337,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -337,7 +337,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_1.location), u"usage_id": unicode(self.html_module_1.location),
...@@ -394,13 +394,13 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -394,13 +394,13 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"quote text", u"quote": u"quote text",
u"text": u"text", u"text": u"text",
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [ u"children": [
unicode(self.vertical.location), unicode(self.vertical.location),
...@@ -408,7 +408,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -408,7 +408,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_2.location), u"usage_id": unicode(self.html_module_2.location),
...@@ -418,13 +418,13 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -418,13 +418,13 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"quote text", u"quote": u"quote text",
u"text": u"text", u"text": u"text",
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [ u"children": [
unicode(self.vertical.location), unicode(self.vertical.location),
...@@ -432,7 +432,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -432,7 +432,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_1.location), u"usage_id": unicode(self.html_module_1.location),
...@@ -492,19 +492,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -492,19 +492,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"test &lt;script&gt;alert('test')&lt;/script&gt;", u"quote": u"test &lt;script&gt;alert('test')&lt;/script&gt;",
u"text": u'text "&lt;&gt;&amp;\'', u"text": u'text "&lt;&gt;&amp;\'',
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)] u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)]
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_1.location), u"usage_id": unicode(self.html_module_1.location),
...@@ -537,19 +537,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -537,19 +537,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"quote text", u"quote": u"quote text",
u"text": u"text", u"text": u"text",
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)] u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)]
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_1.location), u"usage_id": unicode(self.html_module_1.location),
...@@ -583,19 +583,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -583,19 +583,19 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
u"quote": u"quote text", u"quote": u"quote text",
u"text": u"text", u"text": u"text",
u"chapter": { u"chapter": {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)] u"children": [unicode(self.sequential.location)]
}, },
u"section": { u"section": {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)] u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)]
}, },
u"unit": { u"unit": {
u"url": self._get_unit_url(self.course, self.chapter, self.sequential), u"url": self._get_unit_url(self.course, self.chapter, self.sequential),
u"display_name": self.vertical.display_name_with_default, u"display_name": self.vertical.display_name_with_default_escaped,
u"location": unicode(self.vertical.location), u"location": unicode(self.vertical.location),
}, },
u"usage_id": unicode(self.html_module_1.location), u"usage_id": unicode(self.html_module_1.location),
...@@ -646,7 +646,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -646,7 +646,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
""" """
self.assertDictEqual( self.assertDictEqual(
{ {
u"display_name": self.sequential.display_name_with_default, u"display_name": self.sequential.display_name_with_default_escaped,
u"location": unicode(self.sequential.location), u"location": unicode(self.sequential.location),
u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)], u"children": [unicode(self.vertical.location), unicode(self.vertical_with_container.location)],
}, },
...@@ -659,7 +659,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -659,7 +659,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
""" """
self.assertDictEqual( self.assertDictEqual(
{ {
u"display_name": self.html_module_1.display_name_with_default, u"display_name": self.html_module_1.display_name_with_default_escaped,
u"location": unicode(self.html_module_1.location), u"location": unicode(self.html_module_1.location),
}, },
helpers.get_module_context(self.course, self.html_module_1) helpers.get_module_context(self.course, self.html_module_1)
...@@ -671,7 +671,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -671,7 +671,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
""" """
self.assertDictEqual( self.assertDictEqual(
{ {
u"display_name": self.chapter.display_name_with_default, u"display_name": self.chapter.display_name_with_default_escaped,
u"index": 0, u"index": 0,
u"location": unicode(self.chapter.location), u"location": unicode(self.chapter.location),
u"children": [unicode(self.sequential.location)], u"children": [unicode(self.sequential.location)],
...@@ -680,7 +680,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -680,7 +680,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
) )
self.assertDictEqual( self.assertDictEqual(
{ {
u"display_name": self.chapter_2.display_name_with_default, u"display_name": self.chapter_2.display_name_with_default_escaped,
u"index": 1, u"index": 1,
u"location": unicode(self.chapter_2.location), u"location": unicode(self.chapter_2.location),
u"children": [], u"children": [],
...@@ -760,7 +760,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -760,7 +760,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
mock_chapter = MagicMock() mock_chapter = MagicMock()
mock_chapter.url_name = 'chapter_url_name' mock_chapter.url_name = 'chapter_url_name'
mock_chapter.display_name_with_default = 'Test Chapter Display Name' mock_chapter.display_name_with_default_escaped = 'Test Chapter Display Name'
mock_course_module.get_display_items.return_value = [mock_chapter] mock_course_module.get_display_items.return_value = [mock_chapter]
...@@ -790,7 +790,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase): ...@@ -790,7 +790,7 @@ class EdxNotesHelpersTest(ModuleStoreTestCase):
mock_section = MagicMock() mock_section = MagicMock()
mock_section.url_name = 'section_url_name' mock_section.url_name = 'section_url_name'
mock_section.display_name_with_default = 'Test Section Display Name' mock_section.display_name_with_default_escaped = 'Test Section Display Name'
mock_chapter.get_display_items.return_value = [mock_section] mock_chapter.get_display_items.return_value = [mock_section]
mock_section.get_display_items.return_value = [MagicMock()] mock_section.get_display_items.return_value = [MagicMock()]
......
lms/djangoapps/instructor/enrollment.py
...@@ -281,7 +281,7 @@ def get_email_params(course, auto_enroll, secure=True, course_key=None, display_ ...@@ -281,7 +281,7 @@ def get_email_params(course, auto_enroll, secure=True, course_key=None, display_
protocol = 'https' if secure else 'http' protocol = 'https' if secure else 'http'
course_key = course_key or course.id.to_deprecated_string() course_key = course_key or course.id.to_deprecated_string()
display_name = display_name or course.display_name_with_default display_name = display_name or course.display_name_with_default_escaped
stripped_site_name = microsite.get_value( stripped_site_name = microsite.get_value(
'SITE_NAME', 'SITE_NAME',
......
lms/djangoapps/lms_migration/migrate.py
...@@ -132,7 +132,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None): ...@@ -132,7 +132,7 @@ def manage_modulestores(request, reload_dir=None, commit_id=None):
for cdir, course in def_ms.courses.items(): for cdir, course in def_ms.courses.items():
html += '<hr width="100%"/>' html += '<hr width="100%"/>'
html += '<h2>Course: %s (%s)</h2>' % (course.display_name_with_default, cdir) html += '<h2>Course: %s (%s)</h2>' % (course.display_name_with_default_escaped, cdir)
html += '<p>commit_id=%s</p>' % get_commit_id(course) html += '<p>commit_id=%s</p>' % get_commit_id(course)
......
lms/djangoapps/mobile_api/video_outlines/serializers.py
...@@ -107,7 +107,7 @@ def path(block, child_to_parent, start_block): ...@@ -107,7 +107,7 @@ def path(block, child_to_parent, start_block):
if block is not start_block: if block is not start_block:
block_path.append({ block_path.append({
# to be consistent with other edx-platform clients, return the defaulted display name # to be consistent with other edx-platform clients, return the defaulted display name
'name': block.display_name_with_default, 'name': block.display_name_with_default_escaped,
'category': block.category, 'category': block.category,
'id': unicode(block.location) 'id': unicode(block.location)
}) })
......
lms/djangoapps/shoppingcart/models.py
...@@ -1578,7 +1578,7 @@ class PaidCourseRegistration(OrderItem): ...@@ -1578,7 +1578,7 @@ class PaidCourseRegistration(OrderItem):
item.unit_cost = cost item.unit_cost = cost
item.list_price = cost item.list_price = cost
item.line_desc = _(u'Registration for Course: {course_name}').format( item.line_desc = _(u'Registration for Course: {course_name}').format(
course_name=course.display_name_with_default) course_name=course.display_name_with_default_escaped)
item.currency = currency item.currency = currency
order.currency = currency order.currency = currency
item.report_comments = item.csv_report_comments item.report_comments = item.csv_report_comments
...@@ -1755,7 +1755,7 @@ class CourseRegCodeItem(OrderItem): ...@@ -1755,7 +1755,7 @@ class CourseRegCodeItem(OrderItem):
item.list_price = cost item.list_price = cost
item.qty = qty item.qty = qty
item.line_desc = _(u'Enrollment codes for Course: {course_name}').format( item.line_desc = _(u'Enrollment codes for Course: {course_name}').format(
course_name=course.display_name_with_default) course_name=course.display_name_with_default_escaped)
item.currency = currency item.currency = currency
order.currency = currency order.currency = currency
item.report_comments = item.csv_report_comments item.report_comments = item.csv_report_comments
......
lms/djangoapps/shoppingcart/reports.py
...@@ -157,7 +157,8 @@ class CertificateStatusReport(Report): ...@@ -157,7 +157,8 @@ class CertificateStatusReport(Report):
# it in the report. These comparisons are unicode-safe. # it in the report. These comparisons are unicode-safe.
cur_course = get_course_by_id(course_id) cur_course = get_course_by_id(course_id)
university = cur_course.org university = cur_course.org
course = cur_course.number + " " + cur_course.display_name_with_default # TODO add term (i.e. Fall 2013)? # TODO add term (i.e. Fall 2013) to course?
course = cur_course.number + " " + cur_course.display_name_with_default_escaped
counts = CourseEnrollment.objects.enrollment_counts(course_id) counts = CourseEnrollment.objects.enrollment_counts(course_id)
total_enrolled = counts['total'] total_enrolled = counts['total']
audit_enrolled = counts['audit'] audit_enrolled = counts['audit']
...@@ -237,7 +238,7 @@ class UniversityRevenueShareReport(Report): ...@@ -237,7 +238,7 @@ class UniversityRevenueShareReport(Report):
for course_id in course_ids_between(self.start_word, self.end_word): for course_id in course_ids_between(self.start_word, self.end_word):
cur_course = get_course_by_id(course_id) cur_course = get_course_by_id(course_id)
university = cur_course.org university = cur_course.org
course = cur_course.number + " " + cur_course.display_name_with_default course = cur_course.number + " " + cur_course.display_name_with_default_escaped
total_payments_collected = CertificateItem.verified_certificates_monetary_field_sum(course_id, 'purchased', 'unit_cost') total_payments_collected = CertificateItem.verified_certificates_monetary_field_sum(course_id, 'purchased', 'unit_cost')
service_fees = CertificateItem.verified_certificates_monetary_field_sum(course_id, 'purchased', 'service_fee') service_fees = CertificateItem.verified_certificates_monetary_field_sum(course_id, 'purchased', 'service_fee')
num_refunds = CertificateItem.verified_certificates_count(course_id, "refunded") num_refunds = CertificateItem.verified_certificates_count(course_id, "refunded")
......
lms/djangoapps/verify_student/tests/test_views.py
...@@ -2297,7 +2297,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase): ...@@ -2297,7 +2297,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase):
"We have successfully verified your identity for the {assessment} " "We have successfully verified your identity for the {assessment} "
"assessment in the {course_name} course.".format( "assessment in the {course_name} course.".format(
assessment=self.assessment, assessment=self.assessment,
course_name=self.course.display_name_with_default course_name=self.course.display_name_with_default_escaped
), ),
body body
) )
...@@ -2316,7 +2316,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase): ...@@ -2316,7 +2316,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase):
"in the {course_name} course. You have used " "in the {course_name} course. You have used "
"{used_attempts} out of {allowed_attempts} attempts to " "{used_attempts} out of {allowed_attempts} attempts to "
"verify your identity".format( "verify your identity".format(
course_name=self.course.display_name_with_default, course_name=self.course.display_name_with_default_escaped,
assessment=self.assessment, assessment=self.assessment,
used_attempts=1, used_attempts=1,
allowed_attempts=self.allowed_attempts + 1 allowed_attempts=self.allowed_attempts + 1
...@@ -2361,7 +2361,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase): ...@@ -2361,7 +2361,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase):
"{used_attempts} out of {allowed_attempts} attempts to " "{used_attempts} out of {allowed_attempts} attempts to "
"verify your identity, and verification is no longer " "verify your identity, and verification is no longer "
"possible".format( "possible".format(
course_name=self.course.display_name_with_default, course_name=self.course.display_name_with_default_escaped,
assessment=self.assessment, assessment=self.assessment,
used_attempts=2, used_attempts=2,
allowed_attempts=self.allowed_attempts + 1 allowed_attempts=self.allowed_attempts + 1
...@@ -2385,7 +2385,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase): ...@@ -2385,7 +2385,7 @@ class TestEmailMessageWithCustomICRVBlock(ModuleStoreTestCase):
"{used_attempts} out of {allowed_attempts} attempts to " "{used_attempts} out of {allowed_attempts} attempts to "
"verify your identity, and verification is no longer " "verify your identity, and verification is no longer "
"possible".format( "possible".format(
course_name=self.course.display_name_with_default, course_name=self.course.display_name_with_default_escaped,
assessment=self.assessment, assessment=self.assessment,
used_attempts=1, used_attempts=1,
allowed_attempts=self.allowed_attempts + 1 allowed_attempts=self.allowed_attempts + 1
...@@ -2494,7 +2494,7 @@ class TestEmailMessageWithDefaultICRVBlock(ModuleStoreTestCase): ...@@ -2494,7 +2494,7 @@ class TestEmailMessageWithDefaultICRVBlock(ModuleStoreTestCase):
"{used_attempts} out of {allowed_attempts} attempts to " "{used_attempts} out of {allowed_attempts} attempts to "
"verify your identity, and verification is no longer " "verify your identity, and verification is no longer "
"possible".format( "possible".format(
course_name=self.course.display_name_with_default, course_name=self.course.display_name_with_default_escaped,
assessment=self.assessment, assessment=self.assessment,
used_attempts=1, used_attempts=1,
allowed_attempts=1 allowed_attempts=1
......
lms/djangoapps/verify_student/views.py
...@@ -1150,7 +1150,7 @@ def _compose_message_reverification_email( ...@@ -1150,7 +1150,7 @@ def _compose_message_reverification_email(
subject = "Re-verification Status" subject = "Re-verification Status"
context = { context = {
"status": status, "status": status,
"course_name": course.display_name_with_default, "course_name": course.display_name_with_default_escaped,
"assessment": reverification_block.related_assessment "assessment": reverification_block.related_assessment
} }
...@@ -1431,7 +1431,7 @@ class InCourseReverifyView(View): ...@@ -1431,7 +1431,7 @@ class InCourseReverifyView(View):
context = { context = {
'course_key': unicode(course_key), 'course_key': unicode(course_key),
'course_name': course.display_name_with_default, 'course_name': course.display_name_with_default_escaped,
'checkpoint_name': checkpoint.checkpoint_name, 'checkpoint_name': checkpoint.checkpoint_name,
'platform_name': settings.PLATFORM_NAME, 'platform_name': settings.PLATFORM_NAME,
'usage_id': usage_id, 'usage_id': usage_id,
......
lms/templates/conditional_module.html
...@@ -6,7 +6,7 @@ def _message(reqm, message): ...@@ -6,7 +6,7 @@ def _message(reqm, message):
return message.format(link="<a href={url}>{url_name}</a>".format( return message.format(link="<a href={url}>{url_name}</a>".format(
url = reverse('jump_to', kwargs=dict(course_id=reqm.course_id.to_deprecated_string(), url = reverse('jump_to', kwargs=dict(course_id=reqm.course_id.to_deprecated_string(),
location=reqm.location.to_deprecated_string())), location=reqm.location.to_deprecated_string())),
url_name = reqm.display_name_with_default)) url_name = reqm.display_name_with_default_escaped))
%> %>
% if message: % if message:
% for reqm in module.required_modules: % for reqm in module.required_modules:
......
lms/templates/course.html
...@@ -4,11 +4,11 @@ from django.utils.translation import ugettext as _ ...@@ -4,11 +4,11 @@ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<%page args="course" /> <%page args="course" />
<article class="course" id="${course.id | h}" role="region" aria-label="${course.display_name_with_default}"> <article class="course" id="${course.id | h}" role="region" aria-label="${course.display_name_with_default_escaped}">
<a href="${reverse('about_course', args=[course.id.to_deprecated_string()])}"> <a href="${reverse('about_course', args=[course.id.to_deprecated_string()])}">
<header class="course-image"> <header class="course-image">
<div class="cover-image"> <div class="cover-image">
<img src="${course.course_image_url | h}" alt="${course.display_name_with_default} ${course.display_number_with_default | h}" /> <img src="${course.course_image_url | h}" alt="${course.display_name_with_default_escaped} ${course.display_number_with_default | h}" />
<div class="learn-more" aria-hidden=true>${_("LEARN MORE")}</div> <div class="learn-more" aria-hidden=true>${_("LEARN MORE")}</div>
</div> </div>
</header> </header>
...@@ -16,7 +16,7 @@ from django.core.urlresolvers import reverse ...@@ -16,7 +16,7 @@ from django.core.urlresolvers import reverse
<h2 class="course-name"> <h2 class="course-name">
<span class="course-organization">${course.display_org_with_default | h}</span> <span class="course-organization">${course.display_org_with_default | h}</span>
<span class="course-code">${course.display_number_with_default | h}</span> <span class="course-code">${course.display_number_with_default | h}</span>
<span class="course-title">${course.display_name_with_default}</span> <span class="course-title">${course.display_name_with_default_escaped}</span>
</h2> </h2>
<div class="course-date" aria-hidden="true">${_("Starts")}: ${course.start_datetime_text()}</div> <div class="course-date" aria-hidden="true">${_("Starts")}: ${course.start_datetime_text()}</div>
</div> </div>
......
lms/templates/courseware/course_about.html
...@@ -13,7 +13,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -13,7 +13,7 @@ from openedx.core.lib.courses import course_image_url
<%block name="headextra"> <%block name="headextra">
## OG (Open Graph) title and description added below to give social media info to display ## OG (Open Graph) title and description added below to give social media info to display
## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags) ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
<meta property="og:title" content="${course.display_name_with_default}" /> <meta property="og:title" content="${course.display_name_with_default_escaped}" />
<meta property="og:description" content="${get_course_about_section(request, course, 'short_description')}" /> <meta property="og:description" content="${get_course_about_section(request, course, 'short_description')}" />
</%block> </%block>
...@@ -102,7 +102,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -102,7 +102,7 @@ from openedx.core.lib.courses import course_image_url
<script src="${static.url('js/course_info.js')}"></script> <script src="${static.url('js/course_info.js')}"></script>
</%block> </%block>
<%block name="pagetitle">${course.display_name_with_default}</%block> <%block name="pagetitle">${course.display_name_with_default_escaped}</%block>
<section class="course-info"> <section class="course-info">
<header class="course-profile"> <header class="course-profile">
...@@ -111,7 +111,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -111,7 +111,7 @@ from openedx.core.lib.courses import course_image_url
<section class="intro"> <section class="intro">
<hgroup> <hgroup>
<h1> <h1>
${course.display_name_with_default} ${course.display_name_with_default_escaped}
% if not self.theme_enabled(): % if not self.theme_enabled():
<a href="#">${course.display_org_with_default | h}</a> <a href="#">${course.display_org_with_default | h}</a>
% endif % endif
...@@ -220,10 +220,10 @@ from openedx.core.lib.courses import course_image_url ...@@ -220,10 +220,10 @@ from openedx.core.lib.courses import course_image_url
## or something allowing themes to do whatever they ## or something allowing themes to do whatever they
## want here (and on this whole page, really). ## want here (and on this whole page, really).
% if self.stanford_theme_enabled(): % if self.stanford_theme_enabled():
<a href="http://twitter.com/intent/tweet?text=I+just+enrolled+in+${course.number}+${course.display_name_with_default}!+(http://class.stanford.edu)" class="share"> <a href="http://twitter.com/intent/tweet?text=I+just+enrolled+in+${course.number}+${course.display_name_with_default_escaped}!+(http://class.stanford.edu)" class="share">
<i class="icon fa fa-twitter"></i><span class="sr">${_("Tweet that you've enrolled in this course")}</span> <i class="icon fa fa-twitter"></i><span class="sr">${_("Tweet that you've enrolled in this course")}</span>
</a> </a>
<a href="mailto:?subject=Take%20a%20course%20at%20Stanford%20online!&body=I%20just%20enrolled%20in%20${course.number}%20${course.display_name_with_default}+(http://class.stanford.edu)" class="share"> <a href="mailto:?subject=Take%20a%20course%20at%20Stanford%20online!&body=I%20just%20enrolled%20in%20${course.number}%20${course.display_name_with_default_escaped}+(http://class.stanford.edu)" class="share">
<i class="icon fa fa-envelope"></i><span class="sr">${_("Email someone to say you've enrolled in this course")}</span> <i class="icon fa fa-envelope"></i><span class="sr">${_("Email someone to say you've enrolled in this course")}</span>
</a> </a>
% else: % else:
...@@ -235,7 +235,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -235,7 +235,7 @@ from openedx.core.lib.courses import course_image_url
## Twitter account. {url} should appear at the end of the text. ## Twitter account. {url} should appear at the end of the text.
tweet_text = _("I just enrolled in {number} {title} through {account}: {url}").format( tweet_text = _("I just enrolled in {number} {title} through {account}: {url}").format(
number=course.number, number=course.number,
title=course.display_name_with_default, title=course.display_name_with_default_escaped,
account=microsite.get_value('course_about_twitter_account', settings.PLATFORM_TWITTER_ACCOUNT), account=microsite.get_value('course_about_twitter_account', settings.PLATFORM_TWITTER_ACCOUNT),
url=u"http://{domain}{path}".format( url=u"http://{domain}{path}".format(
domain=site_domain, domain=site_domain,
...@@ -250,7 +250,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -250,7 +250,7 @@ from openedx.core.lib.courses import course_image_url
subject=_("Take a course with {platform} online").format(platform=platform_name), subject=_("Take a course with {platform} online").format(platform=platform_name),
body=_("I just enrolled in {number} {title} through {platform} {url}").format( body=_("I just enrolled in {number} {title} through {platform} {url}").format(
number=course.number, number=course.number,
title=course.display_name_with_default, title=course.display_name_with_default_escaped,
platform=platform_name, platform=platform_name,
url=u"http://{domain}{path}".format( url=u"http://{domain}{path}".format(
domain=site_domain, domain=site_domain,
......
lms/templates/courseware/welcome-back.html
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
%> %>
<h2>${chapter_module.display_name_with_default}</h2> <h2>${chapter_module.display_name_with_default_escaped}</h2>
<p>${_("You were most recently in {section_link}. If you\'re done with that, choose another section on the left.").format( <p>${_("You were most recently in {section_link}. If you\'re done with that, choose another section on the left.").format(
section_link=u'<a href="{url}">{section_name}</a>'.format( section_link=u'<a href="{url}">{section_name}</a>'.format(
url=prev_section_url, url=prev_section_url,
section_name=prev_section.display_name_with_default, section_name=prev_section.display_name_with_default_escaped,
) )
)}</p> )}</p>
lms/templates/dashboard/_dashboard_course_listing.html
...@@ -63,16 +63,16 @@ from student.helpers import ( ...@@ -63,16 +63,16 @@ from student.helpers import (
% if show_courseware_link: % if show_courseware_link:
% if not is_course_blocked: % if not is_course_blocked:
<a href="${course_target}" data-course-key="${enrollment.course_id}" class="cover"> <a href="${course_target}" data-course-key="${enrollment.course_id}" class="cover">
<img src="${course_overview.image_urls['small']}" class="course-image" alt="${_('{course_number} {course_name} Home Page').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default) |h}" /> <img src="${course_overview.image_urls['small']}" class="course-image" alt="${_('{course_number} {course_name} Home Page').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default_escaped) |h}" />
</a> </a>
% else: % else:
<a class="fade-cover"> <a class="fade-cover">
<img src="${course_overview.image_urls['small']}" class="course-image" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default) |h}" /> <img src="${course_overview.image_urls['small']}" class="course-image" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default_escaped) |h}" />
</a> </a>
% endif % endif
% else: % else:
<a class="cover"> <a class="cover">
<img src="${course_overview.image_urls['small']}" class="course-image" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default) | h}" /> <img src="${course_overview.image_urls['small']}" class="course-image" alt="${_('{course_number} {course_name} Cover Image').format(course_number=course_overview.number, course_name=course_overview.display_name_with_default_escaped) | h}" />
</a> </a>
% endif % endif
% if settings.FEATURES.get('ENABLE_VERIFIED_CERTIFICATES') and course_verified_certs.get('display_mode') != 'audit': % if settings.FEATURES.get('ENABLE_VERIFIED_CERTIFICATES') and course_verified_certs.get('display_mode') != 'audit':
...@@ -89,12 +89,12 @@ from student.helpers import ( ...@@ -89,12 +89,12 @@ from student.helpers import (
<h3 class="course-title"> <h3 class="course-title">
% if show_courseware_link: % if show_courseware_link:
% if not is_course_blocked: % if not is_course_blocked:
<a data-course-key="${enrollment.course_id}" href="${course_target}">${course_overview.display_name_with_default}</a> <a data-course-key="${enrollment.course_id}" href="${course_target}">${course_overview.display_name_with_default_escaped}</a>
% else: % else:
<a class="disable-look" data-course-key="${enrollment.course_id}">${course_overview.display_name_with_default}</a> <a class="disable-look" data-course-key="${enrollment.course_id}">${course_overview.display_name_with_default_escaped}</a>
% endif % endif
% else: % else:
<span>${course_overview.display_name_with_default}</span> <span>${course_overview.display_name_with_default_escaped}</span>
% endif % endif
</h3> </h3>
<div class="course-info"> <div class="course-info">
...@@ -119,15 +119,15 @@ from student.helpers import ( ...@@ -119,15 +119,15 @@ from student.helpers import (
% if show_courseware_link: % if show_courseware_link:
% if course_overview.has_ended(): % if course_overview.has_ended():
% if not is_course_blocked: % if not is_course_blocked:
<a href="${course_target}" class="enter-course archived" data-course-key="${enrollment.course_id}">${_('View Archived Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default}</span></a> <a href="${course_target}" class="enter-course archived" data-course-key="${enrollment.course_id}">${_('View Archived Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default_escaped}</span></a>
% else: % else:
<a class="enter-course-blocked archived" data-course-key="${enrollment.course_id}">${_('View Archived Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default}</span></a> <a class="enter-course-blocked archived" data-course-key="${enrollment.course_id}">${_('View Archived Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default_escaped}</span></a>
% endif % endif
% else: % else:
% if not is_course_blocked: % if not is_course_blocked:
<a href="${course_target}" class="enter-course" data-course-key="${enrollment.course_id}">${_('View Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default}</span></a> <a href="${course_target}" class="enter-course" data-course-key="${enrollment.course_id}">${_('View Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default_escaped}</span></a>
% else: % else:
<a class="enter-course-blocked" data-course-key="${enrollment.course_id}">${_('View Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default}</span></a> <a class="enter-course-blocked" data-course-key="${enrollment.course_id}">${_('View Course')}<span class="sr">&nbsp;${course_overview.display_name_with_default_escaped}</span></a>
% endif % endif
% endif % endif
...@@ -178,7 +178,7 @@ from student.helpers import ( ...@@ -178,7 +178,7 @@ from student.helpers import (
% endif % endif
% endif % endif
<div class="wrapper-action-more" data-course-key="${enrollment.course_id}"> <div class="wrapper-action-more" data-course-key="${enrollment.course_id}">
<a href="#actions-dropdown-${dashboard_index}" class="action action-more" id="actions-dropdown-link-${dashboard_index}" aria-haspopup="true" aria-expanded="false" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}"> <a href="#actions-dropdown-${dashboard_index}" class="action action-more" id="actions-dropdown-link-${dashboard_index}" aria-haspopup="true" aria-expanded="false" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}">
<span class="sr">${_('Course options dropdown')}</span> <span class="sr">${_('Course options dropdown')}</span>
<i class="fa fa-cog" aria-hidden="true"></i> <i class="fa fa-cog" aria-hidden="true"></i>
</a> </a>
...@@ -188,13 +188,13 @@ from student.helpers import ( ...@@ -188,13 +188,13 @@ from student.helpers import (
<li class="actions-item" id="actions-item-unenroll-${dashboard_index}"> <li class="actions-item" id="actions-item-unenroll-${dashboard_index}">
% if is_paid_course and show_refund_option: % if is_paid_course and show_refund_option:
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}"
data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("You will be refunded the amount you paid.") | h}"> data-refund-info="${_("You will be refunded the amount you paid.") | h}">
${_('Unenroll')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" <a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}"
data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("You will be refunded the amount you paid.") | h}"> data-refund-info="${_("You will be refunded the amount you paid.") | h}">
${_('Unenroll')} ${_('Unenroll')}
...@@ -202,13 +202,13 @@ from student.helpers import ( ...@@ -202,13 +202,13 @@ from student.helpers import (
% endif % endif
% elif is_paid_course and not show_refund_option: % elif is_paid_course and not show_refund_option:
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}"
data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("You will not be refunded the amount you paid.") | h}"> data-refund-info="${_("You will not be refunded the amount you paid.") | h}">
${_('Unenroll')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" <a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}"
data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the purchased course %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("You will not be refunded the amount you paid.") | h}"> data-refund-info="${_("You will not be refunded the amount you paid.") | h}">
${_('Unenroll')} ${_('Unenroll')}
...@@ -216,25 +216,25 @@ from student.helpers import ( ...@@ -216,25 +216,25 @@ from student.helpers import (
% endif % endif
% elif enrollment.mode != "verified": % elif enrollment.mode != "verified":
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}"
data-track-info="${_("Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?") | h}"> data-track-info="${_("Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?") | h}">
${_('Unenroll')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" <a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}"
data-track-info="${_("Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?") | h}"> data-track-info="${_("Are you sure you want to unenroll from %(course_name)s (%(course_number)s)?") | h}">
${_('Unenroll')} ${_('Unenroll')}
</a> </a>
% endif % endif
% elif show_refund_option: % elif show_refund_option:
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}" <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}"
data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("You will be refunded the amount you paid.") | h}"> data-refund-info="${_("You will be refunded the amount you paid.") | h}">
${_('Unenroll')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}" <a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}"
data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("You will be refunded the amount you paid.") | h}"> data-refund-info="${_("You will be refunded the amount you paid.") | h}">
${_('Unenroll')} ${_('Unenroll')}
...@@ -242,13 +242,13 @@ from student.helpers import ( ...@@ -242,13 +242,13 @@ from student.helpers import (
% endif % endif
% else: % else:
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}" <a href="#unenroll-modal" class="action action-unenroll" rel="leanModal" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}"
data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("The refund deadline for this course has passed, so you will not receive a refund.") | h}"> data-refund-info="${_("The refund deadline for this course has passed, so you will not receive a refund.") | h}">
${_('Unenroll')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}" <a class="action action-unenroll is-disabled" data-course-id="${course_overview.id | h}" data-course-number="${course_overview.number | h}" data-course-name="${course_overview.display_name_with_default_escaped | h}" data-dashboard-index="${dashboard_index}" data-cert-name-long="${cert_name_long | h}"
data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}" data-track-info="${_("Are you sure you want to unenroll from the verified %(cert_name_long)s track of %(course_name)s (%(course_number)s)?") | h}"
data-refund-info="${_("The refund deadline for this course has passed, so you will not receive a refund.") | h}"> data-refund-info="${_("The refund deadline for this course has passed, so you will not receive a refund.") | h}">
${_('Unenroll')} ${_('Unenroll')}
...@@ -360,7 +360,7 @@ from student.helpers import ( ...@@ -360,7 +360,7 @@ from student.helpers import (
'href="#unenroll-modal">'.format( 'href="#unenroll-modal">'.format(
course_id=escape(course_overview.id), course_id=escape(course_overview.id),
course_number=escape(course_overview.number), course_number=escape(course_overview.number),
course_name=escape(course_overview.display_name_with_default), course_name=escape(course_overview.display_name_with_default_escaped),
) )
), ),
unenroll_link_end="</a>", unenroll_link_end="</a>",
......
lms/templates/discussion/index.html
...@@ -28,7 +28,7 @@ from django.core.urlresolvers import reverse ...@@ -28,7 +28,7 @@ from django.core.urlresolvers import reverse
<section class="discussion container" id="discussion-container" <section class="discussion container" id="discussion-container"
data-roles="${roles | h}" data-roles="${roles | h}"
data-course-id="${course_id | h}" data-course-id="${course_id | h}"
data-course-name="${course.display_name_with_default | h}" data-course-name="${course.display_name_with_default_escaped | h}"
data-user-info="${user_info | h}" data-user-info="${user_info | h}"
data-user-create-comment="${can_create_comment | h}" data-user-create-comment="${can_create_comment | h}"
data-user-create-subcomment="${can_create_subcomment | h}" data-user-create-subcomment="${can_create_subcomment | h}"
......
lms/templates/discussion/user_profile.html
...@@ -33,7 +33,7 @@ from django.template.defaultfilters import escapejs ...@@ -33,7 +33,7 @@ from django.template.defaultfilters import escapejs
</nav> </nav>
</section> </section>
<section class="course-content container discussion-user-threads" data-course-id="${course.id | h}" data-course-name="${course.display_name_with_default | h}" data-threads="${threads | h}" data-user-info="${user_info | h}" data-page="${page | h}" data-num-pages="${num_pages | h}"/> <section class="course-content container discussion-user-threads" data-course-id="${course.id | h}" data-course-name="${course.display_name_with_default_escaped | h}" data-threads="${threads | h}" data-user-info="${user_info | h}" data-page="${page | h}" data-num-pages="${num_pages | h}"/>
</div> </div>
</section> </section>
......
lms/templates/emails/account_creation_and_enroll_emailMessage.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("Welcome to {course_name}").format(course_name=course.display_name_with_default)} ${_("Welcome to {course_name}").format(course_name=course.display_name_with_default_escaped)}
${_("To get started, please visit https://{site_name}. The login information for your account follows.").format(site_name=site_name)} ${_("To get started, please visit https://{site_name}. The login information for your account follows.").format(site_name=site_name)}
...@@ -11,4 +11,4 @@ ${_("It is recommended that you change your password.")} ...@@ -11,4 +11,4 @@ ${_("It is recommended that you change your password.")}
${_("Sincerely yours," ${_("Sincerely yours,"
"" ""
"The {course_name} Team").format(course_name=course.display_name_with_default)} "The {course_name} Team").format(course_name=course.display_name_with_default_escaped)}
lms/templates/emails/add_beta_tester_email_message.txt
...@@ -4,7 +4,7 @@ ${_("Dear {full_name}").format(full_name=full_name)} ...@@ -4,7 +4,7 @@ ${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been invited to be a beta tester for {course_name} at {site_name} by a " ${_("You have been invited to be a beta tester for {course_name} at {site_name} by a "
"member of the course staff.").format( "member of the course staff.").format(
course_name=course.display_name_with_default, course_name=course.display_name_with_default_escaped,
site_name=site_name site_name=site_name
)} )}
......
lms/templates/emails/add_beta_tester_email_subject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to a beta test for {course_name}").format( ${_("You have been invited to a beta test for {course_name}").format(
course_name=course.display_name_with_default course_name=course.display_name_with_default_escaped
)} )}
lms/templates/emails/enroll_email_allowedmessage.txt
...@@ -4,7 +4,7 @@ ${_("Dear student,")} ...@@ -4,7 +4,7 @@ ${_("Dear student,")}
${_("You have been invited to join {course_name} at {site_name} by a " ${_("You have been invited to join {course_name} at {site_name} by a "
"member of the course staff.").format( "member of the course staff.").format(
course_name=display_name or course.display_name_with_default, course_name=display_name or course.display_name_with_default_escaped,
site_name=site_name site_name=site_name
)} )}
% if is_shib_course: % if is_shib_course:
...@@ -26,13 +26,13 @@ ${_("To finish your registration, please visit {registration_url} and fill " ...@@ -26,13 +26,13 @@ ${_("To finish your registration, please visit {registration_url} and fill "
% if auto_enroll: % if auto_enroll:
${_("Once you have registered and activated your account, you will see " ${_("Once you have registered and activated your account, you will see "
"{course_name} listed on your dashboard.").format( "{course_name} listed on your dashboard.").format(
course_name=display_name or course.display_name_with_default course_name=display_name or course.display_name_with_default_escaped
)} )}
% elif course_about_url is not None: % elif course_about_url is not None:
${_("Once you have registered and activated your account, visit {course_about_url} " ${_("Once you have registered and activated your account, visit {course_about_url} "
"to join the course.").format(course_about_url=course_about_url)} "to join the course.").format(course_about_url=course_about_url)}
% else: % else:
${_("You can then enroll in {course_name}.").format(course_name=display_name or course.display_name_with_default)} ${_("You can then enroll in {course_name}.").format(course_name=display_name or course.display_name_with_default_escaped)}
% endif % endif
% endif % endif
......
lms/templates/emails/enroll_email_allowedsubject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been invited to register for {course_name}").format( ${_("You have been invited to register for {course_name}").format(
course_name=display_name or course.display_name_with_default course_name=display_name or course.display_name_with_default_escaped
)} )}
\ No newline at end of file
lms/templates/emails/enroll_email_enrolledmessage.txt
...@@ -5,7 +5,7 @@ ${_("Dear {full_name}").format(full_name=full_name)} ...@@ -5,7 +5,7 @@ ${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been enrolled in {course_name} at {site_name} by a member " ${_("You have been enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course should now appear on your {site_name} " "of the course staff. The course should now appear on your {site_name} "
"dashboard.").format( "dashboard.").format(
course_name=display_name or course.display_name_with_default, course_name=display_name or course.display_name_with_default_escaped,
site_name=site_name site_name=site_name
)} )}
......
lms/templates/emails/enroll_email_enrolledsubject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been enrolled in {course_name}").format( ${_("You have been enrolled in {course_name}").format(
course_name=display_name or course.display_name_with_default course_name=display_name or course.display_name_with_default_escaped
)} )}
\ No newline at end of file
lms/templates/emails/remove_beta_tester_email_message.txt
...@@ -5,7 +5,7 @@ ${_("Dear {full_name}").format(full_name=full_name)} ...@@ -5,7 +5,7 @@ ${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been removed as a beta tester for {course_name} at {site_name} by a " ${_("You have been removed as a beta tester for {course_name} at {site_name} by a "
"member of the course staff. The course will remain on your dashboard, but " "member of the course staff. The course will remain on your dashboard, but "
"you will no longer be part of the beta testing group.").format( "you will no longer be part of the beta testing group.").format(
course_name=course.display_name_with_default, course_name=course.display_name_with_default_escaped,
site_name=site_name site_name=site_name
)} )}
......
lms/templates/emails/remove_beta_tester_email_subject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been removed from a beta test for {course_name}").format( ${_("You have been removed from a beta test for {course_name}").format(
course_name=course.display_name_with_default course_name=course.display_name_with_default_escaped
)} )}
lms/templates/emails/unenroll_email_allowedmessage.txt
...@@ -4,7 +4,7 @@ ${_("Dear Student,")} ...@@ -4,7 +4,7 @@ ${_("Dear Student,")}
${_("You have been un-enrolled from course {course_name} by a member " ${_("You have been un-enrolled from course {course_name} by a member "
"of the course staff. Please disregard the invitation " "of the course staff. Please disregard the invitation "
"previously sent.").format(course_name=display_name or course.display_name_with_default)} "previously sent.").format(course_name=display_name or course.display_name_with_default_escaped)}
---- ----
${_("This email was automatically sent from {site_name} " ${_("This email was automatically sent from {site_name} "
......
lms/templates/emails/unenroll_email_enrolledmessage.txt
...@@ -5,13 +5,13 @@ ${_("Dear {full_name}").format(full_name=full_name)} ...@@ -5,13 +5,13 @@ ${_("Dear {full_name}").format(full_name=full_name)}
${_("You have been un-enrolled in {course_name} at {site_name} by a member " ${_("You have been un-enrolled in {course_name} at {site_name} by a member "
"of the course staff. The course will no longer appear on your " "of the course staff. The course will no longer appear on your "
"{site_name} dashboard.").format( "{site_name} dashboard.").format(
course_name=display_name or course.display_name_with_default, site_name=site_name course_name=display_name or course.display_name_with_default_escaped, site_name=site_name
)} )}
${_("Your other courses have not been affected.")} ${_("Your other courses have not been affected.")}
---- ----
${_("This email was automatically sent from {site_name} to " ${_("This email was automatically sent from {site_name} to "
"{full_name}").format( "{full_name}").format(
full_name=full_name, site_name=site_name full_name=full_name, site_name=site_name
)} )}
\ No newline at end of file
lms/templates/emails/unenroll_email_subject.txt
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
${_("You have been un-enrolled from {course_name}").format( ${_("You have been un-enrolled from {course_name}").format(
course_name=display_name or course.display_name_with_default course_name=display_name or course.display_name_with_default_escaped
)} )}
\ No newline at end of file
lms/templates/navigation-edx.html
...@@ -50,7 +50,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -50,7 +50,7 @@ site_status_msg = get_site_status_msg(course_id)
<h2 class="course-header"> <h2 class="course-header">
<span class="provider">${course.display_org_with_default | h}:</span> <span class="provider">${course.display_org_with_default | h}:</span>
<span class="course-number">${course.display_number_with_default | h}</span> <span class="course-number">${course.display_number_with_default | h}</span>
<span class="course-name">${course.display_name_with_default}</span> <span class="course-name">${course.display_name_with_default_escaped}</span>
</h2> </h2>
% endif % endif
......
lms/templates/navigation.html
...@@ -51,7 +51,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -51,7 +51,7 @@ site_status_msg = get_site_status_msg(course_id)
<h2 class="course-header"><span class="provider">${course.display_org_with_default | h}:</span> <h2 class="course-header"><span class="provider">${course.display_org_with_default | h}:</span>
<span class="course-number">${course.display_number_with_default | h}</span> <span class="course-number">${course.display_number_with_default | h}</span>
<% <%
display_name = course.display_name_with_default display_name = course.display_name_with_default_escaped
if settings.FEATURES.get('CUSTOM_COURSES_EDX', False): if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
ccx = get_current_ccx(course.id) ccx = get_current_ccx(course.id)
if ccx: if ccx:
......
lms/templates/shoppingcart/receipt.html
...@@ -292,7 +292,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -292,7 +292,7 @@ from openedx.core.lib.courses import course_image_url
<div class="clearfix"> <div class="clearfix">
<div class="image"> <div class="image">
<img class="item-image" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${course.display_number_with_default | h} ${course.display_name_with_default} Image"/> alt="${course.display_number_with_default | h} ${course.display_name_with_default_escaped} Image"/>
</div> </div>
<div class="data-input"> <div class="data-input">
......
lms/templates/shoppingcart/registration_code_receipt.html
...@@ -20,7 +20,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -20,7 +20,7 @@ from openedx.core.lib.courses import course_image_url
<img class="item-image" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${_("{course_number} {course_title} Cover Image").format( alt="${_("{course_number} {course_title} Cover Image").format(
course_number=course.display_number_with_default, course_number=course.display_number_with_default,
course_title=course.display_name_with_default, course_title=course.display_name_with_default_escaped,
)}"/> )}"/>
</div> </div>
<div class="enrollment-details"> <div class="enrollment-details">
......
lms/templates/shoppingcart/registration_code_redemption.html
...@@ -20,7 +20,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -20,7 +20,7 @@ from openedx.core.lib.courses import course_image_url
<img class="item-image" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${_("{course_number} {course_title} Cover Image").format( alt="${_("{course_number} {course_title} Cover Image").format(
course_number=course.display_number_with_default, course_number=course.display_number_with_default,
course_title=course.display_name_with_default, course_title=course.display_name_with_default_escaped,
)}" /> )}" />
</div> </div>
<div class="enrollment-details"> <div class="enrollment-details">
......
lms/templates/shoppingcart/shopping_cart.html
...@@ -66,7 +66,7 @@ from openedx.core.lib.courses import course_image_url ...@@ -66,7 +66,7 @@ from openedx.core.lib.courses import course_image_url
<div class="clearfix"> <div class="clearfix">
<div class="image"> <div class="image">
<img class="item-image" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${course.display_number_with_default | h} ${course.display_name_with_default} ${_('Cover Image')}" /> alt="${course.display_number_with_default | h} ${course.display_name_with_default_escaped} ${_('Cover Image')}" />
</div> </div>
<div class="data-input"> <div class="data-input">
## Translators: "Registration for:" is followed by a course name ## Translators: "Registration for:" is followed by a course name
......
openedx/core/djangoapps/content/course_overviews/models.py
...@@ -324,6 +324,20 @@ class CourseOverview(TimeStampedModel): ...@@ -324,6 +324,20 @@ class CourseOverview(TimeStampedModel):
""" """
return course_metadata_utils.display_name_with_default(self) return course_metadata_utils.display_name_with_default(self)
@property
def display_name_with_default_escaped(self):
"""
DEPRECATED: use display_name_with_default
Return html escaped reasonable display name for the course.
Note: This newly introduced method should not be used. It was only
introduced to enable a quick search/replace and the ability to slowly
migrate and test switching to display_name_with_default, which is no
longer escaped.
"""
return course_metadata_utils.display_name_with_default_escaped(self)
def has_started(self): def has_started(self):
""" """
Returns whether the the course has started. Returns whether the the course has started.
......
openedx/core/djangoapps/content/course_overviews/tests.py
...@@ -104,6 +104,7 @@ class CourseOverviewTestCase(ModuleStoreTestCase): ...@@ -104,6 +104,7 @@ class CourseOverviewTestCase(ModuleStoreTestCase):
'number', 'number',
'url_name', 'url_name',
'display_name_with_default', 'display_name_with_default',
'display_name_with_default_escaped',
'start_date_is_still_default', 'start_date_is_still_default',
'pre_requisite_courses', 'pre_requisite_courses',
'enrollment_domain', 'enrollment_domain',
......
openedx/core/lib/xblock_utils.py
...@@ -128,7 +128,7 @@ def wrap_xblock( ...@@ -128,7 +128,7 @@ def wrap_xblock(
template_context = { template_context = {
'content': block.display_name if display_name_only else frag.content, 'content': block.display_name if display_name_only else frag.content,
'classes': css_classes, 'classes': css_classes,
'display_name': block.display_name_with_default, 'display_name': block.display_name_with_default_escaped,
'data_attributes': u' '.join(u'data-{}="{}"'.format(markupsafe.escape(key), markupsafe.escape(value)) 'data_attributes': u' '.join(u'data-{}="{}"'.format(markupsafe.escape(key), markupsafe.escape(value))
for key, value in data.iteritems()), for key, value in data.iteritems()),
} }
......
pylintrc
...@@ -95,10 +95,10 @@ const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$ ...@@ -95,10 +95,10 @@ const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$
class-rgx = [A-Z_][a-zA-Z0-9]+$ class-rgx = [A-Z_][a-zA-Z0-9]+$
function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$ function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$
method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$ method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$
attr-rgx = [a-z_][a-z0-9_]{2,30}$ attr-rgx = [a-z_][a-z0-9_]{2,40}$
argument-rgx = [a-z_][a-z0-9_]{2,30}$ argument-rgx = [a-z_][a-z0-9_]{2,40}$
variable-rgx = [a-z_][a-z0-9_]{2,30}$ variable-rgx = [a-z_][a-z0-9_]{2,40}$
class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,40}|(__.*__))$
inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$ inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$
good-names = f,i,j,k,db,ex,Run,_,__ good-names = f,i,j,k,db,ex,Run,_,__
bad-names = foo,bar,baz,toto,tutu,tata bad-names = foo,bar,baz,toto,tutu,tata
...@@ -180,4 +180,4 @@ int-import-graph = ...@@ -180,4 +180,4 @@ int-import-graph =
[EXCEPTIONS] [EXCEPTIONS]
overgeneral-exceptions = Exception overgeneral-exceptions = Exception
# 22900b2201bd1e9f0050ff51de25691939dc7901 # b98d7d902efebf1f5eaafb847960e366a35fd51b
pylintrc_tweaks
# pylintrc tweaks for use with edx_lint. # pylintrc tweaks for use with edx_lint.
[MASTER] [MASTER]
ignore+ = ,migrations ignore+ = ,migrations
[BASIC]
attr-rgx = [a-z_][a-z0-9_]{2,40}$
argument-rgx = [a-z_][a-z0-9_]{2,40}$
variable-rgx = [a-z_][a-z0-9_]{2,40}$
class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,40}|(__.*__))$
themes/edx.org/lms/templates/header.html
...@@ -50,7 +50,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -50,7 +50,7 @@ site_status_msg = get_site_status_msg(course_id)
<h2 class="course-header"> <h2 class="course-header">
<span class="provider">${course.display_org_with_default | h}:</span> <span class="provider">${course.display_org_with_default | h}:</span>
<span class="course-number">${course.display_number_with_default | h}</span> <span class="course-number">${course.display_number_with_default | h}</span>
<span class="course-name">${course.display_name_with_default}</span> <span class="course-name">${course.display_name_with_default_escaped}</span>
</h2> </h2>
% endif % endif
......
themes/red-theme/lms/templates/header.html
...@@ -52,7 +52,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -52,7 +52,7 @@ site_status_msg = get_site_status_msg(course_id)
<h2><span class="provider">${course.display_org_with_default | h}:</span> <h2><span class="provider">${course.display_org_with_default | h}:</span>
${course.display_number_with_default | h} ${course.display_number_with_default | h}
<% <%
display_name = course.display_name_with_default display_name = course.display_name_with_default_escaped
if settings.FEATURES.get('CUSTOM_COURSES_EDX', False): if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
ccx = get_current_ccx() ccx = get_current_ccx()
if ccx: if ccx:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment