launchpad-reviewers team mailing list archive

[Matthew Revell <matthew.revell@xxxxxxxxxxxxx>]

Matthew Revell has proposed merging lp:~matthew.revell/launchpad/merge-email-75976 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #75976 E-mail message about merging accounts is confusing
  https://bugs.launchpad.net/bugs/75976

For more details, see:
https://code.launchpad.net/~matthew.revell/launchpad/merge-email-75976/+merge/47113

When someone requests the merger of two Launchpad accounts, Launchpad sends an email to the primary email address of the requesting account.

The current email text has some mistakes and is confusing. This branch rewrites that text to correct those mistakes and with the aim of making the email easier/friendlier to read.

I'm not sure how to test this in a dev environment.
-- 
https://code.launchpad.net/~matthew.revell/launchpad/merge-email-75976/+merge/47113
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~matthew.revell/launchpad/merge-email-75976 into lp:launchpad.

=== modified file 'lib/canonical/launchpad/emailtemplates/request-merge.txt'
--- lib/canonical/launchpad/emailtemplates/request-merge.txt	2007-11-03 16:41:03 +0000
+++ lib/canonical/launchpad/emailtemplates/request-merge.txt	2011-01-21 21:26:51 +0000
@@ -1,21 +1,30 @@
 
 Hello
 
-We received a request to merge the Launchpad account named
-'%(dupename)s' -- which have registered the email address
-'%(toaddress)s' -- into the account named '%(requester)s'.
-
-If you made this request, please click on the link below
-and complete the process to merge the '%(dupename)s'
-account into your existing Launchpad account.
+Launchpad: request to merge accounts
+------------------------------------
+
+Someone has asked us to merge one of your Launchpad 
+accounts with another.
+
+If you go ahead, this will merge the account called
+'%(dupename)s' into the account '%(requester)s'.
+
+To confirm you want to do this, please follow
+this link:
 
     %(token_url)s
 
-If you did not make this request, please ignore this message
-or report it as a possible attempt at a security attack on
-your data.
+If you didn't ask to merge these accounts, please
+either ignore this email or report it to the 
+Launchpad team: feedback@xxxxxxxxxxxxx
+
+You can read more about merging accounts in our
+help wiki:
+
+    https://help.launchpad.net/YourAccount/Merging
 
 Thank you,
 
 The Launchpad team
-
+https://launchpad.net