Merge pull request #6428 from edx/shoppingcart-improve-i18n

Improve i18n for shopping cart registration code redemption page

lms/templates/shoppingcart/registration_code_redemption.html

@@ -18,8 +18,10 @@ from courseware.courses import course_image_url, get_course_about_section
     <section>
       <div class="course-image">
         <img style="width: 100%; height: auto;" src="${course_image_url(course)}"
-             alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Cover Image"/>
-      </div>
+            alt="${_("{course_number} {course_title} Cover Image").format(
+              course_number=course.display_number_with_default,
+              course_title=get_course_about_section(course, 'title'),
+            )}" />
       <div class="enrollment-details">
         <div class="sub-title">${_("Confirm your enrollment for:")}
           <span class="course-date-label">${_("course dates")}</span>
@@ -29,49 +31,70 @@ from courseware.courses import course_image_url, get_course_about_section
 
         <div class="course-title">
           <h1>
-            ${_("{course_name}").format(course_name=course.display_name)}
-              <span class="course-dates">${_("{start_date}").format(start_date=course.start_datetime_text())} -  ${_("{end_date}").format(end_date=course.end_datetime_text())}
+            ${course.display_name}
+              <span class="course-dates">
+                ${course.start_datetime_text()}
+                -
+                ${course.end_datetime_text()}
               </span>
           </h1>
         </div>
         <hr>
         <div>
           % if reg_code_already_redeemed:
-          <% dashboard_url = reverse('dashboard')%>
           <p class="enrollment-text">
-            ${_("You've clicked a link for an enrollment code that has already been used."
-            " Check your <a href={dashboard_url}>course dashboard</a> to see if you're enrolled in the course,"
-            " or contact your company's administrator.").format(dashboard_url=dashboard_url)}
+            ${_(
+              "You've clicked a link for an enrollment code that has already "
+              "been used. Check your {link_start}course dashboard{link_end} "
+              "to see if you're enrolled in the course, or contact your "
+              "company's administrator."
+            ).format(
+              link_start='<a href="{url}">'.format(url=reverse('dashboard')),
+              link_end='</a>',
+            )}
           </p>
           % elif redemption_success:
           <p class="enrollment-text">
-            ${_("You have successfully enrolled in {course_name}."
-            " This course has now been added to your dashboard.").format(course_name=course.display_name)}
+            ${_(
+              "You have successfully enrolled in {course_name}. "
+              "This course has now been added to your dashboard."
+            ).format(
+              course_name=course.display_name,
+            )}
           </p>
           % elif registered_for_course:
-          <% dashboard_url = reverse('dashboard')%>
           <p class="enrollment-text">
-            ${_("You're already registered for this course."
-            " Visit your <a href={dashboard_url}>dashboard</a> to see the course.").format(dashboard_url=dashboard_url)}
+            ${_(
+              "You're already registered for this course. "
+              "Visit your {link_start}dashboard{link_end} to see the course."
+            ).format(
+              link_start='<a href="{url}">'.format(url=reverse('dashboard')),
+              link_end='</a>',
+            )}
           </p>
           % else:
           <p class="enrollment-text">
-            ${_("You're about to activate an enrollment code for {course_name} by {site_name}. "
-            "This code can only be used one time, so you should only activate this code if you're its intended"
-            " recipient.").format(course_name=course.display_name, site_name=site_name)}
+            ${_(
+              "You're about to activate an enrollment code for {course_name} "
+              "by {site_name}. This code can only be used one time, so you "
+              "should only activate this code if you're its intended "
+              "recipient."
+            ).format(
+              course_name=course.display_name,
+              site_name=site_name,
+            )}
           </p>
           % endif
         </div>
       </div>
       % if not reg_code_already_redeemed:
         %if redemption_success:
-          <% dashboard_url = reverse('dashboard') %>
-          <a href="${dashboard_url}" class="link-button course-link-bg-color">${_("View Dashboard &nbsp; &nbsp; &#x25b8;")}</a>
+          <a href="${reverse('dashboard')}" class="link-button course-link-bg-color">${_("View Dashboard &nbsp; &nbsp; &#x25b8;")}</a>
         %elif not registered_for_course:
           <form method="post">
             <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
-            <input type="submit" value="Activate Course Enrollment     &#x25b8;" id="id_active_course_enrollment"
-               name="active_course_enrollment">
+            <input type="submit" value="${_("Activate Course Enrollment")} &#x25b8;"
+               id="id_active_course_enrollment" name="active_course_enrollment">
           </form>
         %endif
       %endif