Skip to content

E
edx-platform
Commit fe1d2449 by David Baumgold
Options

Respond to review comments

parent 90e4de5c
Showing with 26 additions and 29 deletions
lms/djangoapps/shoppingcart/models.py
...@@ -1020,11 +1020,11 @@ class PaidCourseRegistration(OrderItem): ...@@ -1020,11 +1020,11 @@ class PaidCourseRegistration(OrderItem):
Basically tells the user to visit the dashboard to see their new classes Basically tells the user to visit the dashboard to see their new classes
""" """
notification = _( notification = _(
"Please visit your {link_start}dashboard{link_end} " u"Please visit your {link_start}dashboard{link_end} "
"to see your new course." u"to see your new course."
).format( ).format(
link_start='<a href="{url}">'.format(url=reverse('dashboard')), link_start=u'<a href="{url}">'.format(url=reverse('dashboard')),
link_end='</a>', link_end=u'</a>',
) )
return self.pk_with_subclass, set([notification]) return self.pk_with_subclass, set([notification])
......
lms/templates/shoppingcart/receipt.html
...@@ -21,7 +21,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -21,7 +21,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<div class="message-left"> <div class="message-left">
<% courses_url = reverse('courses') %> <% courses_url = reverse('courses') %>
% if receipt_has_donation_item: % if receipt_has_donation_item:
<b>${_("Thank you for your Purchase!")}</b> <b>${_("Thank you for your purchase!")}</b>
% for inst in instructions: % for inst in instructions:
${inst} ${inst}
% endfor % endfor
...@@ -31,35 +31,32 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -31,35 +31,32 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<% dashboard_url = reverse('dashboard') %> <% dashboard_url = reverse('dashboard') %>
<a href="${dashboard_url}" class="blue pull-right">${_("View Dashboard")} <i class="icon-caret-right"></i></a> <a href="${dashboard_url}" class="blue pull-right">${_("View Dashboard")} <i class="icon-caret-right"></i></a>
<span class="mt-7"> <span class="mt-7">
${_("You have successfully been enrolled for {course_names}. " ${_(u"You have successfully been enrolled for {course_names}. "
"The following receipt has been emailed to {receipient_emails}").format( u"The following receipt has been emailed to {receipient_emails}").format(
course_names="<b>{course_names}</b>".format( course_names=u"<b>{course_names}</b>".format(
course_names=appended_course_names course_names=appended_course_names
), ),
receipient_emails="<strong>{receipient_emails}</strong>".format( receipient_emails=u"<strong>{receipient_emails}</strong>".format(
receipient_emails=appended_recipient_emails receipient_emails=appended_recipient_emails
), ),
)} )}
</span> </span>
% elif order_type == 'business': % elif order_type == 'business':
${_("You have successfully purchased {items} for {course_names}. " ${ungettext(
"The following receipt has been emailed to {receipient_emails}" "You have successfully purchased <b>{number} course registration code</b> for {course_names}.",
).format( "You have successfully purchased <b>{number} course registration codes</b> for {course_names}.",
items="<b>{items}</b>".format( total_registration_codes
items=ungettext( ).format(
"{number} course registration code", number=total_registration_codes,
"{number} course registration codes", course_names=u"<b>{course_names}</b>".format(
total_registration_codes course_names=appended_course_names
).format(number=total_registration_codes)
),
course_names="<b>{course_names}</b>".format(
course_names=appended_course_names
),
receipient_emails="<strong>{receipient_emails}</strong>".format(
receipient_emails=appended_recipient_emails,
)
) )
} )}
${_("The following receipt has been emailed to {receipient_emails}").format(
receipient_emails=u"<strong>{receipient_emails}</strong>".format(
receipient_emails=appended_recipient_emails,
)
)}
% endif % endif
</div> </div>
...@@ -136,7 +133,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -136,7 +133,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<b>${_('Company Contact Name')}:</b> <b>${_('Company Contact Name')}:</b>
<label> <label>
% if order.company_contact_name: % if order.company_contact_name:
${ order.company_contact_name } ${order.company_contact_name}
% else: % else:
N/A N/A
% endif % endif
...@@ -148,7 +145,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -148,7 +145,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<b>${_('Company Contact Email')}:</b> <b>${_('Company Contact Email')}:</b>
<label> <label>
% if order.company_contact_email: % if order.company_contact_email:
${ order.company_contact_email } ${order.company_contact_email}
% else: % else:
N/A N/A
% endif % endif
...@@ -160,7 +157,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -160,7 +157,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<b>${_('Recipient Name')}:</b> <b>${_('Recipient Name')}:</b>
<label> <label>
% if order.recipient_name: % if order.recipient_name:
${ order.recipient_name } ${order.recipient_name}
% else: % else:
N/A N/A
% endif % endif
......
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