- <%= _.sprintf( - gettext( "Thanks for returning to verify your ID in: %(courseName)s"), - { courseName: '' + courseName + '' } + <%= HtmlUtils.interpolateHtml( + gettext( "Thanks for returning to verify your ID in: {courseName}"), + { courseName: HtmlUtils.joinHtml( + HtmlUtils.HTML(''), + courseName, + HtmlUtils.HTML('') + ) } ) %>
<% } else { %> diff --git a/lms/templates/verify_student/make_payment_step.underscore b/lms/templates/verify_student/make_payment_step.underscore index 4f572426c1..dcd4c7fb1c 100644 --- a/lms/templates/verify_student/make_payment_step.underscore +++ b/lms/templates/verify_student/make_payment_step.underscore @@ -2,17 +2,25 @@- <%= _.sprintf( - gettext( "You are enrolling in: %(courseName)s"), - { courseName: '' + courseName + '' } - ) %> + <%= HtmlUtils.interpolateHtml( + gettext( "You are enrolling in: {courseName}"), + { courseName: HtmlUtils.joinHtml( + HtmlUtils.HTML(''), + courseName, + HtmlUtils.HTML('') + ) } + ) %>
<% } else { %>- <%= _.sprintf( - gettext( "You are upgrading your enrollment for: %(courseName)s"), - { courseName: '' + courseName + '' } - ) %> + <%= HtmlUtils.interpolateHtml( + gettext( "You are upgrading your enrollment for: {courseName}"), + { courseName: HtmlUtils.joinHtml( + HtmlUtils.HTML(''), + courseName, + HtmlUtils.HTML('') + ) } + ) %>
<%- gettext( "You have already verified your ID!" ) %>
- <%= _.sprintf( - gettext( "Your verification status is good until %(verificationGoodUntil)s." ), - { verificationGoodUntil: verificationGoodUntil } + <%- StringUtils.interpolate( + gettext( "Your verification status is good until {verificationGoodUntil}." ), + { verificationGoodUntil: verificationGoodUntil } ) %>
- <%= _.sprintf( - gettext( "You are enrolling in %(courseName)s"), - { courseName: '' + courseName + '' } - ) %> + <%= HtmlUtils.interpolateHtml( + gettext( "You are enrolling in: {courseName}"), + { courseName: HtmlUtils.joinHtml( + HtmlUtils.HTML(''), + courseName, + HtmlUtils.HTML('') + ) } + ) %>
<% } else { %>- <%= _.sprintf( - gettext( "Upgrade to a Verified Certificate for %(courseName)s"), - { courseName: '' + courseName + '' } - ) %> + <%= HtmlUtils.interpolateHtml( + gettext( "Upgrade to a Verified Certificate for {courseName}"), + { courseName: HtmlUtils.joinHtml( + HtmlUtils.HTML(''), + courseName, + HtmlUtils.HTML('') + ) } + ) %>
<% } %> @@ -33,12 +41,12 @@<% if ( courseModeSlug === 'no-id-professional' || courseModeSlug === 'professional') { %> - <%= _.sprintf( - gettext( "Professional Certificate for %(courseName)s"),{ courseName: courseName } + <%- StringUtils.interpolate( + gettext( "Professional Certificate for {courseName}"),{ courseName: courseName } )%> <% } else { %> - <%= _.sprintf( - gettext( "Verified Certificate for %(courseName)s"),{ courseName: courseName } + <%- StringUtils.interpolate( + gettext( "Verified Certificate for {courseName}"),{ courseName: courseName } )%> <% } %>
diff --git a/lms/templates/verify_student/missed_deadline.html b/lms/templates/verify_student/missed_deadline.html index f342ec0372..4c2f7f950b 100644 --- a/lms/templates/verify_student/missed_deadline.html +++ b/lms/templates/verify_student/missed_deadline.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%! from django.utils.translation import ugettext as _ from lms.djangoapps.verify_student.views import PayAndVerifyView diff --git a/lms/templates/verify_student/pay_and_verify.html b/lms/templates/verify_student/pay_and_verify.html index 4b3a99e609..ada91b0c51 100644 --- a/lms/templates/verify_student/pay_and_verify.html +++ b/lms/templates/verify_student/pay_and_verify.html @@ -1,6 +1,9 @@ +<%page expression_filter="h"/> <%! import json from django.utils.translation import ugettext as _ + +from openedx.core.djangolib.markup import Text, HTML from lms.djangoapps.verify_student.views import PayAndVerifyView %> <%namespace name='static' file='../static_content.html'/> @@ -10,13 +13,13 @@ from lms.djangoapps.verify_student.views import PayAndVerifyView <%block name="pagetitle"> % if message_key == PayAndVerifyView.UPGRADE_MSG: - ${_("Upgrade Your Enrollment For {course_name}.").format(course_name=course.display_name) | h} + ${_("Upgrade Your Enrollment For {course_name}.").format(course_name=course.display_name)} % elif message_key == PayAndVerifyView.PAYMENT_CONFIRMATION_MSG: - ${_("Receipt For {course_name}").format(course_name=course.display_name) | h} + ${_("Receipt For {course_name}").format(course_name=course.display_name)} % elif message_key in [PayAndVerifyView.VERIFY_NOW_MSG, PayAndVerifyView.VERIFY_LATER_MSG]: - ${_("Verify For {course_name}").format(course_name=course.display_name) | h} + ${_("Verify For {course_name}").format(course_name=course.display_name)} % else: - ${_("Enroll In {course_name}").format(course_name=course.display_name) | h} + ${_("Enroll In {course_name}").format(course_name=course.display_name)} % endif %block> @@ -58,10 +61,10 @@ from lms.djangoapps.verify_student.views import PayAndVerifyView${_("Have questions?")}
${_("Please read {a_start}our FAQs to view common questions about our certificates{a_end}.").format(a_start='', a_end="")}
+${Text(_("Please read {a_start}our FAQs to view common questions about our certificates{a_end}.")).format( + a_start=HTML('').format(marketing_link('WHAT_IS_VERIFIED_CERT')), + a_end=HTML(''))}
${_("Technical Requirements")}
${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your webcam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).").format(a_start='', a_end="")}
+${Text(_("Please make sure your browser is updated to the {strong_start}{a_start}most recent version possible{a_end}{strong_end}. Also, please make sure your {strong_start}webcam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).{strong_end}")).format( + a_start=HTML(''), + a_end=HTML(''), + strong_start=HTML(''), + strong_end=HTML(''))}