From 17a3f556fb5257b3f5d815d33147f15cf2fcb0fa Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzo@renzolucioni.com>
Date: Mon, 3 Nov 2014 18:28:19 -0500
Subject: [PATCH] Fix track selection header copy

---
 .../verify_student/tests/test_views.py        |  4 +-
 .../verify_student/_verification_header.html  | 48 +++++++++++++++----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index 1d45efe154..24180fc710 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -186,12 +186,12 @@ class TestVerifyView(ModuleStoreTestCase):
         response = self.client.get(url)
         self.assertEquals(response.status_code, 302)
 
-    def test_valid_course_registration_text(self):
+    def test_valid_course_enrollment_text(self):
         url = reverse('verify_student_verify',
                       kwargs={"course_id": unicode(self.course_key)})
         response = self.client.get(url)
 
-        self.assertIn("You are now enrolled in the audit track", response.content)
+        self.assertIn("You are now enrolled in", response.content)
 
     def test_valid_course_upgrade_text(self):
         url = reverse('verify_student_verify',
diff --git a/lms/templates/verify_student/_verification_header.html b/lms/templates/verify_student/_verification_header.html
index 8a1cdadac2..40dfa7dd1d 100644
--- a/lms/templates/verify_student/_verification_header.html
+++ b/lms/templates/verify_student/_verification_header.html
@@ -3,18 +3,37 @@
 <header class="page-header">
     <h2 class="title">
         <span class="wrapper-sts">
+            <% organization = '<span class="sts-course-org">' + course_org + '</span>' %>
+            <% course_name = '<span class="sts-course-number">' + course_num + '</span> <span class="sts-course-name">' + 'course_name' + '</span>' %>
             % if upgrade:
-                <span class="sts-label">${_("You are upgrading your enrollment for")}</span>
+                <span class="sts-label">
+                    ${_("You are upgrading your enrollment for {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % elif reverify:
-                <span class="sts-label">${_("You are re-verifying for")}</span>
+                <span class="sts-label">
+                    ${_("You are re-verifying for {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % elif modes_dict and "professional" in modes_dict:
-                <span class="sts-label">${_("You are registering for")}</span>
+                <span class="sts-label">
+                    ${_("You are enrolling in {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % else:
-                <span class="sts-label">${_("Congrats! You are now enrolled in the audit track")}</span>
+                <span class="sts-label">
+                    ${_("Congrats! You are now enrolled in {organization}'s {course_name}").format(
+                        organization=organization,
+                        course_name=course_name
+                    )}
+                </span>
             % endif
-                <span class="sts-course-org">${course_org}'s</span>
-                <span class="sts-course-number">${course_num}</span>
-                <span class="sts-course-name">${course_name}</span>
         </span>
 
         % if modes_dict and "professional" in modes_dict:
@@ -27,11 +46,20 @@
             <span class="sts-track">
                 <span class="sts-track-value">
                     % if upgrade:
-                        <span class="context">${_("Upgrading to:")}</span> ${_("Verified")}
+                        ${_("{span_start}Upgrading to:{span_end} Verified").format(
+                            span_start='<span class="context">',
+                            span_end='</span>'
+                        )}
                     % elif reverify:
-                        <span class="context">${_("Re-verifying for:")}</span> ${_("Verified")}
+                        ${_("{span_start}Re-verifying for:{span_end} Verified").format(
+                            span_start='<span class="context">',
+                            span_end='</span>'
+                        )}
                     % else:
-                        <span class="context">${_("Registering as: ")}</span> ${_("Verified")}
+                        ${_("{span_start}Enrolling as:{span_end} Verified").format(
+                            span_start='<span class="context">',
+                            span_end='</span>'
+                        )}
                     % endif
                 </span>
             </span>