launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/launchpad:better-merge-wording into launchpad:master.

Commit message:
Add more words to the people merge page.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/382274

The description of the action on the people merge page isn't immediately clear which person is which.
Clarify that a bit.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:better-merge-wording into launchpad:master.

diff --git a/lib/lp/registry/interfaces/person.py b/lib/lp/registry/interfaces/person.py
index 4306f87..7dad556 100644
--- a/lib/lp/registry/interfaces/person.py
+++ b/lib/lp/registry/interfaces/person.py
@@ -2590,12 +2590,14 @@ class IAdminPeopleMergeSchema(Interface):
     dupe_person = Choice(
         title=_('Duplicated Person'), required=True,
         vocabulary='AdminMergeablePerson',
-        description=_("The duplicated person found in Launchpad."))
+        description=_(
+            "The duplicated person found in Launchpad. "
+            "This account will be removed."))
 
     target_person = Choice(
         title=_('Target Person'), required=True,
         vocabulary='AdminMergeablePerson',
-        description=_("The person to be merged on."))
+        description=_("The person to be merged on. This account will remain."))
 
 
 class IAdminTeamMergeSchema(Interface):