← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~ilasc/launchpad:fix-unicode-person-notification-stormify into launchpad:master

 

Ioana Lasc has proposed merging ~ilasc/launchpad:fix-unicode-person-notification-stormify into launchpad:master.

Commit message:
Add missing unicode to personmerge.py

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ilasc/launchpad/+git/launchpad/+merge/387215
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ilasc/launchpad:fix-unicode-person-notification-stormify into launchpad:master.
diff --git a/lib/lp/registry/personmerge.py b/lib/lp/registry/personmerge.py
index e71d5ff..8e63a36 100644
--- a/lib/lp/registry/personmerge.py
+++ b/lib/lp/registry/personmerge.py
@@ -977,11 +977,11 @@ def merge_people(from_person, to_person, reviewer, delete=False):
     if to_person.is_team:
         mail_text = get_email_template(
             'team-merged.txt', app='registry')
-        subject = 'Launchpad teams merged'
+        subject = u'Launchpad teams merged'
     else:
         mail_text = get_email_template(
             'person-merged.txt', app='registry')
-        subject = 'Launchpad accounts merged'
+        subject = u'Launchpad accounts merged'
     mail_text = mail_text % {
         'dupename': from_person.name,
         'person': to_person.name,