diff --git a/common/djangoapps/student/tests/test_verification_status.py b/common/djangoapps/student/tests/test_verification_status.py index dced0d7cc0..c13e44d548 100644 --- a/common/djangoapps/student/tests/test_verification_status.py +++ b/common/djangoapps/student/tests/test_verification_status.py @@ -214,8 +214,8 @@ class TestCourseVerificationStatus(UrlResetMixin, ModuleStoreTestCase): BANNER_ALT_MESSAGES = { None: "Honor", - VERIFY_STATUS_NEED_TO_VERIFY: "ID Verified Pending Ribbon/Badge", - VERIFY_STATUS_SUBMITTED: "ID Verified Pending Ribbon/Badge", + VERIFY_STATUS_NEED_TO_VERIFY: "ID verification pending", + VERIFY_STATUS_SUBMITTED: "ID verification pending", VERIFY_STATUS_APPROVED: "ID Verified Ribbon/Badge", VERIFY_STATUS_MISSED_DEADLINE: "Honor" } diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index 026d4c0e95..5c16627360 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -1,15 +1,17 @@ <%page args="course, enrollment, show_courseware_link, cert_status, show_email_settings, course_mode_info, show_refund_option, is_paid_course, is_course_blocked, verification_status" /> -<%! from django.utils.translation import ugettext as _ %> <%! - from django.core.urlresolvers import reverse - from courseware.courses import course_image_url, get_course_about_section - from student.helpers import ( - VERIFY_STATUS_NEED_TO_VERIFY, - VERIFY_STATUS_SUBMITTED, - VERIFY_STATUS_APPROVED, - VERIFY_STATUS_MISSED_DEADLINE - ) +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext +from django.core.urlresolvers import reverse +from markupsafe import escape +from courseware.courses import course_image_url, get_course_about_section +from student.helpers import ( + VERIFY_STATUS_NEED_TO_VERIFY, + VERIFY_STATUS_SUBMITTED, + VERIFY_STATUS_APPROVED, + VERIFY_STATUS_MISSED_DEADLINE +) %> <% @@ -56,13 +58,15 @@ % if verification_status.get('status') in [VERIFY_STATUS_NEED_TO_VERIFY, VERIFY_STATUS_SUBMITTED]: ${_("Enrolled as: ")} - ID Verified Pending Ribbon/Badge -
${_("Verified Pending")}
+ ## Translators: This text describes that the student has enrolled for a Verified Certificate, but verification of identity is pending. + ${_( + ## Translators: The student is enrolled for a Verified Certificate, but verification of identity is pending. +
${_("Verified: Pending Verification")}
% elif verification_status.get('status') == VERIFY_STATUS_APPROVED: ${_("Enrolled as: ")} - ID Verified Ribbon/Badge + ${_(
${_("Verified")}
% else: @@ -74,7 +78,7 @@ % else: ${_("Enrolled as: ")} - ID Verified Ribbon/Badge + ${_(
${_("Verified")}
% endif @@ -134,7 +138,11 @@
% if verification_status['days_until_deadline'] is not None:

${_('Verification not yet complete.')}

-

${_('You only have {days} days left to verify for this course.').format(days=verification_status['days_until_deadline'])}

+

${ungettext( + 'You only have {days} day left to verify for this course.', + 'You only have {days} days left to verify for this course.', + verification_status['days_until_deadline'] + ).format(days=verification_status['days_until_deadline'])}

% else:

${_('Almost there!')}

${_('You still need to verify for this course.')}

@@ -177,7 +185,7 @@ % else: % endif - ID Verified Ribbon/Badge + ${_( ${_("Upgrade to Verified Track")} @@ -189,14 +197,23 @@ %endif % if is_course_blocked:

- ${_("You can no longer access this course because payment has not yet been received. You " - "can {link_start}contact the account holder{link_end} to request payment, or you can " - "{unenroll_link_start}unenroll{unenroll_link_end} from this course").format( - link_start='', - link_end='', - unenroll_link_start='', - unenroll_link_end="" - )} + ${_("You can no longer access this course because payment has not yet been received. " + "You can {contact_link_start}contact the account holder{contact_link_end} " + "to request payment, or you can " + "{unenroll_link_start}unenroll{unenroll_link_end} " + "from this course").format( + contact_link_start='', + contact_link_end='', + unenroll_link_start=( + ''.format( + course_id=escape(course.id), + course_number=escape(course.number), + ) + ), + unenroll_link_end="", + )}

%endif