Merge pull request #5665 from edx/cdodge/better-encoding-for-csv-downloads

Fix unicode problem and also make display links a bit shorter

lms/djangoapps/shoppingcart/models.py

@@ -254,7 +254,7 @@ class Order(models.Model):
             for registration_code in registration_codes:
                 redemption_url = reverse('register_code_redemption', args=[registration_code.code])
                 url = '{base_url}{redemption_url}'.format(base_url=site_name, redemption_url=redemption_url)
-                csv_writer.writerow([course.display_name, registration_code.code, url])
+                csv_writer.writerow([unicode(course.display_name).encode("utf-8"), registration_code.code, url])
 
         return csv_file, course_info
 

lms/templates/shoppingcart/receipt.html

@@ -70,7 +70,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
             <td>${registration_code.code}</td>
 
             <% redemption_url = reverse('register_code_redemption', args = [registration_code.code] ) %>
-            <% enrollment_url = '{base_url}{redemption_url}'.format(base_url=site_name, redemption_url=redemption_url) %>
+            <% enrollment_url = '{redemption_url}'.format(redemption_url=redemption_url) %>
             <td><a href="${redemption_url}">${enrollment_url}</a></td>
           </tr>
         % endfor