Fix inaccurate misplacement message

On the final attempt, misplaced items are not returned to the bank.
Change the "misplaced" feedback message to reflect this.

drag_and_drop_v2/drag_and_drop_v2.py

@@ -549,7 +549,14 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin):
                 FeedbackMessages.correctly_placed,
                 FeedbackMessages.MessageClasses.CORRECTLY_PLACED
             )
-            _add_msg_if_exists(misplaced_ids, FeedbackMessages.misplaced, FeedbackMessages.MessageClasses.MISPLACED)
+
+            # Misplaced items are not returned to the bank on the final attempt.
+            if self.attempts_remain:
+                misplaced_template = FeedbackMessages.misplaced_returned
+            else:
+                misplaced_template = FeedbackMessages.misplaced
+
+            _add_msg_if_exists(misplaced_ids, misplaced_template, FeedbackMessages.MessageClasses.MISPLACED)
             _add_msg_if_exists(missing_ids, FeedbackMessages.not_placed, FeedbackMessages.MessageClasses.NOT_PLACED)
 
         if self.attempts_remain and (misplaced_ids or missing_ids):

drag_and_drop_v2/translations/en/LC_MESSAGES/text.po

@@ -545,7 +545,13 @@ msgid_plural "Correctly placed {correct_count} items."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils.py:32
+#: utils.py:62
+msgid "Misplaced {misplaced_count} item."
+msgid_plural "Misplaced {misplaced_count} items."
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils.py:73
 msgid "Misplaced {misplaced_count} item. Misplaced item was returned to item bank."
 msgid_plural "Misplaced {misplaced_count} items. Misplaced items were returned to item bank."
 msgstr[0] ""

drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po

@@ -633,12 +633,18 @@ msgid_plural "Correctly placed {correct_count} items."
 msgstr[0] "Çörréçtlý pläçéd {correct_count} ïtém. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
 msgstr[1] "Çörréçtlý pläçéd {correct_count} ïtéms. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
 
-#: utils.py:32
-msgid "Misplaced {misplaced_count} item. Misplaced item was returned to item bank."
-msgid_plural "Misplaced {misplaced_count} items. Misplaced items were returned to item bank."
+#: utils.py:62
+msgid "Misplaced {misplaced_count} item."
+msgid_plural "Misplaced {misplaced_count} items."
 msgstr[0] "Mïspläçéd {misplaced_count} ïtém. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
 msgstr[1] "Mïspläçéd {misplaced_count} ïtéms. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
 
+#: utils.py:73
+msgid "Misplaced {misplaced_count} item. Misplaced item was returned to item bank."
+msgid_plural "Misplaced {misplaced_count} items. Misplaced items were returned to item bank."
+msgstr[0] "Mïspläçéd {misplaced_count} ïtém. Mïspläçéd ïtém wäs rétürnéd tö ïtém ßänk. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+msgstr[1] "Mïspläçéd {misplaced_count} ïtéms. Mïspläçéd ïtéms wéré rétürnéd tö ïtém ßänk. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#"
+
 #: utils.py:40
 msgid "Did not place {missing_count} required item."
 msgid_plural "Did not place {missing_count} required items."

drag_and_drop_v2/utils.py

@@ -60,6 +60,17 @@ class FeedbackMessages(object):
         Formats "misplaced items" message
         """
         return ngettext(
+            'Misplaced {misplaced_count} item.',
+            'Misplaced {misplaced_count} items.',
+            number
+        ).format(misplaced_count=number)
+
+    @staticmethod
+    def misplaced_returned(number, ngettext=ngettext_fallback):
+        """
+        Formats "misplaced items returned to bank" message
+        """
+        return ngettext(
             'Misplaced {misplaced_count} item. Misplaced item was returned to item bank.',
             'Misplaced {misplaced_count} items. Misplaced items were returned to item bank.',
             number

tests/integration/test_interaction_assessment.py

@@ -236,7 +236,7 @@ class AssessmentInteractionTest(
         feedback_lines = [
             "FEEDBACK",
             FeedbackMessages.correctly_placed(1),
-            FeedbackMessages.misplaced(1),
+            FeedbackMessages.misplaced_returned(1),
             FeedbackMessages.not_placed(2),
             START_FEEDBACK
         ]

tests/unit/test_advanced.py

@@ -553,13 +553,20 @@ class TestDragAndDropAssessmentData(AssessmentModeFixture, unittest.TestCase):
             self._make_feedback_message(
                 FeedbackMessages.correctly_placed(1), FeedbackMessages.MessageClasses.CORRECTLY_PLACED
             ),
-            self._make_feedback_message(FeedbackMessages.misplaced(1), FeedbackMessages.MessageClasses.MISPLACED),
+            self._make_feedback_message(FeedbackMessages.misplaced_returned(1), FeedbackMessages.MessageClasses.MISPLACED),
             self._make_feedback_message(FeedbackMessages.not_placed(1), FeedbackMessages.MessageClasses.NOT_PLACED),
             self._make_feedback_message(self.INITIAL_FEEDBACK, None),
         ]
 
         self._assert_item_and_overall_feedback(res, expected_item_feedback, expected_overall_feedback)
 
+    def test_do_attempt_shows_correct_misplaced_feedback_at_last_attempt(self):
+        self._set_final_attempt()
+        self._submit_solution({0: self.ZONE_2})
+        res = self._do_attempt()
+        misplaced_message = self._make_feedback_message(FeedbackMessages.misplaced(1), FeedbackMessages.MessageClasses.MISPLACED)
+        self.assertIn(misplaced_message, res[self.OVERALL_FEEDBACK_KEY])
+
     def test_do_attempt_no_item_state(self):
         """
         Test do_attempt overall feedback when no item state is saved - no items were ever dropped.
@@ -584,7 +591,7 @@ class TestDragAndDropAssessmentData(AssessmentModeFixture, unittest.TestCase):
             self._make_feedback_message(
                 FeedbackMessages.correctly_placed(2), FeedbackMessages.MessageClasses.CORRECTLY_PLACED
             ),
-            self._make_feedback_message(FeedbackMessages.misplaced(1), FeedbackMessages.MessageClasses.MISPLACED),
+            self._make_feedback_message(FeedbackMessages.misplaced_returned(1), FeedbackMessages.MessageClasses.MISPLACED),
             self._make_feedback_message(FeedbackMessages.not_placed(1), FeedbackMessages.MessageClasses.NOT_PLACED),
             self._make_feedback_message(self.INITIAL_FEEDBACK, None),
         ]