Merge ~cjwatson/launchpad:resubmit-vote-name into launchpad:master

[Colin Watson]

Rename "Resubmit" vote to "Needs Resubmitting"

Merge proposal submitters often interpret the "Resubmit" vote to mean "I have made the requested changes to this merge proposal and would like to resubmit it for review", whereas in fact it's intended to be cast by a reviewer and means "the idea might be sound but the implementation needs significant rework". Rename it so that it's clearer that it goes with the "Needs Fixing" and "Needs Information" votes.

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

diff --git a/lib/canonical/launchpad/icing/css/colours.scss b/lib/canonical/launchpad/icing/css/colours.scss
index 6b4c041..64f3a72 100644
--- a/lib/canonical/launchpad/icing/css/colours.scss
+++ b/lib/canonical/launchpad/icing/css/colours.scss
@@ -452,7 +452,7 @@
     color: #930;
   }
 
-  .voteDISAPPROVE, .voteRESUBMIT {
+  .voteDISAPPROVE, .voteNEEDS_RESUBMITTING {
     color: red;
   }
 
diff --git a/lib/lp/code/browser/branchmergeproposal.py b/lib/lp/code/browser/branchmergeproposal.py
index a72cf2a..1662539 100644
--- a/lib/lp/code/browser/branchmergeproposal.py
+++ b/lib/lp/code/browser/branchmergeproposal.py
@@ -860,7 +860,8 @@ class DecoratedCodeReviewVoteReference:
         CodeReviewVote.ABSTAIN: CodeReviewVote.ABSTAIN.title,
         CodeReviewVote.NEEDS_INFO: CodeReviewVote.NEEDS_INFO.title,
         CodeReviewVote.NEEDS_FIXING: CodeReviewVote.NEEDS_FIXING.title,
-        CodeReviewVote.RESUBMIT: CodeReviewVote.RESUBMIT.title,
+        CodeReviewVote.NEEDS_RESUBMITTING: (
+            CodeReviewVote.NEEDS_RESUBMITTING.title),
         }
 
     def __init__(self, context, user, users_vote):
diff --git a/lib/lp/code/enums.py b/lib/lp/code/enums.py
index d2a9262..f950d5e 100644
--- a/lib/lp/code/enums.py
+++ b/lib/lp/code/enums.py
@@ -1079,7 +1079,7 @@ class CodeReviewVote(DBEnumeratedType):
                   'NEEDS_INFO',
                   'ABSTAIN',
                   'DISAPPROVE',
-                  'RESUBMIT',
+                  'NEEDS_RESUBMITTING',
                   )
 
     DISAPPROVE = DBItem(1, """
@@ -1101,8 +1101,8 @@ class CodeReviewVote(DBEnumeratedType):
         Reviewer wants the proposed merge to happen.
         """)
 
-    RESUBMIT = DBItem(4, """
-        Resubmit
+    NEEDS_RESUBMITTING = DBItem(4, """
+        Needs Resubmitting
 
         Reviewer thinks that the idea might be sound but the implementation
         needs significant rework.