From 799571b213de0e0e2b68aff04465337b4612f37f Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Tue, 29 Sep 2015 10:23:36 -0400
Subject: [PATCH] Make the message to the end user consistent across as
 requirement types, except for grade requirements

---
 lms/djangoapps/courseware/tests/test_credit_requirements.py | 2 +-
 lms/templates/courseware/progress.html                      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/test_credit_requirements.py b/lms/djangoapps/courseware/tests/test_credit_requirements.py
index 7130f95b8d..96d8fc3a17 100644
--- a/lms/djangoapps/courseware/tests/test_credit_requirements.py
+++ b/lms/djangoapps/courseware/tests/test_credit_requirements.py
@@ -112,7 +112,7 @@ class ProgressPageCreditRequirementsTest(ModuleStoreTestCase):
             response,
             "{}, you have met the requirements for credit in this course.".format(self.USER_FULL_NAME)
         )
-        self.assertContains(response, "Verified on {date}".format(date=self._now_formatted_date()))
+        self.assertContains(response, "Completed {date}".format(date=self._now_formatted_date()))
         self.assertContains(response, "95%")
 
     def test_credit_requirements_not_eligible(self):
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 1f2806994f..9483e8efea 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -136,12 +136,10 @@ from django.utils.http import urlquote_plus
                                     <span>${_("Verification Failed" )}</span>
                                 %elif requirement['status'] == 'satisfied':
                                     <i class="fa fa-check"></i>
-                                    % if requirement['namespace'] == 'reverification':
-                                    <span>Verified on ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
-                                    % elif requirement['namespace'] == 'grade' and 'final_grade' in requirement['reason']:
+                                    % if requirement['namespace'] == 'grade' and 'final_grade' in requirement['reason']:
                                     <span>${int(requirement['reason']['final_grade'] * 100)}%</span>
                                     % else:
-                                    <span>Completed</span>
+                                    <span>${_("Completed")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
                                     % endif
                                 %endif
                             %else: