diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 0550c5c0d5..fa54c3e540 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -8,6 +8,7 @@ from django.template import RequestContext import third_party_auth from third_party_auth import pipeline from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string +from openedx.core.djangolib.markup import Text, HTML %> <% @@ -200,7 +201,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str

- ${_("Email Settings for {course_number}").format(course_number='')} + ${Text(_("Email Settings for {course_number}")).format(course_number=HTML(''))} , ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not ${_("window open")} diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index de9e3184af..92ae61d505 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -8,6 +8,7 @@ from django.utils.translation import ungettext from django.core.urlresolvers import reverse from course_modes.models import CourseMode from course_modes.helpers import enrollment_mode_display +from openedx.core.djangolib.js_utils import dump_js_escaped_json from openedx.core.djangolib.markup import Text, HTML from student.helpers import ( VERIFY_STATUS_NEED_TO_VERIFY, @@ -317,7 +318,13 @@ from student.helpers import (

${_('Your verification will expire soon!')}

## Translators: start_link and end_link will be replaced with HTML tags; ## please do not translate these. -

${Text(_('Your current verification will expire before the verification deadline for this course. {start_link}Re-verify your identity now{end_link} using a webcam and a government-issued ID.')).format(start_link=HTML(''.format(href=reverse('verify_student_reverify'))), end_link=HTML(''))}

+

${Text(_('Your current verification will expire before the verification deadline ' + 'for this course. {start_link}Re-verify your identity now{end_link} using a webcam and a ' + 'government-issued ID.')).format( + start_link=HTML('').format(href=reverse('verify_student_reverify')), + end_link=HTML('') + )} +

% endif % endif @@ -334,10 +341,10 @@ from student.helpers import ( "It's a proven motivator to complete the course. {line_break}" "{link_start}Learn more about the verified {cert_name_long}{link_end}.")).format( line_break=HTML('
'), - link_start=HTML(''.format( + link_start=HTML('').format( marketing_link('WHAT_IS_VERIFIED_CERT'), enrollment.course_id - )), + ), link_end=HTML(''), cert_name_long=cert_name_long )} @@ -394,7 +401,7 @@ from student.helpers import (
  • ${Text(_("You must successfully complete {link_start}{prc_display}{link_end} before you begin this course.")).format( - link_start=HTML(''.format(prc_target)), + link_start=HTML('').format(prc_target), link_end=HTML(''), prc_display=course_requirements['courses'][0]['display'], )} @@ -409,7 +416,7 @@ from student.helpers import (