From fe1d244900ffcfc447d97df063b2f699a60441f3 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Mon, 29 Dec 2014 10:46:57 -0500
Subject: [PATCH] Respond to review comments

---
 lms/djangoapps/shoppingcart/models.py   |  8 ++---
 lms/templates/shoppingcart/receipt.html | 47 ++++++++++++-------------
 2 files changed, 26 insertions(+), 29 deletions(-)

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