From 9e0497dfab7a58123a2b73eecd1f65b6a18373bc Mon Sep 17 00:00:00 2001
From: Chris Rodriguez <github@chrisrodriguez.me>
Date: Mon, 8 Feb 2016 10:12:17 -0500
Subject: [PATCH] Updating response status messaging

---
 common/lib/capa/capa/inputtypes.py                 | 12 ++++++------
 common/lib/capa/capa/templates/choicegroup.html    |  6 +++---
 common/lib/capa/capa/templates/optioninput.html    |  2 +-
 common/lib/capa/capa/templates/schematicinput.html |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 601aaa601f..cb36e35721 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -93,12 +93,12 @@ class Status(object):
         }
         tooltips = {
             # Translators: these are tooltips that indicate the state of an assessment question
-            'correct': _('This is correct.'),
-            'incorrect': _('This is incorrect.'),
-            'partially-correct': _('This is partially correct.'),
-            'unanswered': _('This is unanswered.'),
-            'unsubmitted': _('This is unanswered.'),
-            'queued': _('This is being processed.'),
+            'correct': _('This answer is correct.'),
+            'incorrect': _('This answer is incorrect.'),
+            'partially-correct': _('This answer is partially correct.'),
+            'unanswered': _('This answer is unanswered.'),
+            'unsubmitted': _('This answer is unanswered.'),
+            'queued': _('This answer is being processed.'),
         }
         self.display_name = names.get(status, unicode(status))
         self.display_tooltip = tooltips.get(status, u'')
diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
index 1b16470de3..55314db731 100644
--- a/common/lib/capa/capa/templates/choicegroup.html
+++ b/common/lib/capa/capa/templates/choicegroup.html
@@ -47,11 +47,11 @@
                 <span class="sr">
                     %for choice_id, choice_description in choices:
                         % if choice_id in value:
-                            ${choice_description}, 
+                            ${choice_description},
                         %endif
                     %endfor
                     -
-                    ${status.display_name}
+                    ${status.display_tooltip}
                 </span>
             </span>
         % endif
@@ -62,4 +62,4 @@
     % if msg:
     <span class="message">${msg|n}</span>
     % endif
-</form>
\ No newline at end of file
+</form>
diff --git a/common/lib/capa/capa/templates/optioninput.html b/common/lib/capa/capa/templates/optioninput.html
index 24b7afec9e..21a716e57e 100644
--- a/common/lib/capa/capa/templates/optioninput.html
+++ b/common/lib/capa/capa/templates/optioninput.html
@@ -16,7 +16,7 @@
     <span class="status ${status.classname}"
         id="status_${id}"
         aria-describedby="input_${id}" data-tooltip="${status.display_tooltip}">
-      <span class="sr">${value|h} - ${status.display_name}</span>
+      <span class="sr">${value|h} - ${status.display_tooltip}</span>
     </span>
   </div>
   <p class="answer" id="answer_${id}"></p>
diff --git a/common/lib/capa/capa/templates/schematicinput.html b/common/lib/capa/capa/templates/schematicinput.html
index 6b1f798139..d5e1027f40 100644
--- a/common/lib/capa/capa/templates/schematicinput.html
+++ b/common/lib/capa/capa/templates/schematicinput.html
@@ -18,6 +18,6 @@
   <span id="answer_${id}"></span>
   <div class="indicator-container">
     <span class="status ${status.classname}" id="status_${id}" aria-describedby="input_${id}"></span>
-    <span class="sr">${status.display_name}</span>
+    <span class="sr">${status.display_tooltip}</span>
   </div>
 </div>