Merge lp:~stevenk/launchpad/user-himself into lp:launchpad

[Steve Kowalik]

Drop the gender specificness of the user in PersonTransferJob.

Refer to the user as 'the user themselves', rather than 'the user himself'. Disgraceful.

[Steve Kowalik (stevenk)]

review: Approve (code)

[Robert Collins (lifeless)]

The bug (114753) suggests just dropping the 'himself' rather than using the plural.

e.g. self.reviewer_name = 'the user'

What do you think?

=== modified file 'lib/lp/registry/doc/teammembership-email-notification.txt'
--- lib/lp/registry/doc/teammembership-email-notification.txt	2011-12-07 03:31:09 +0000
+++ lib/lp/registry/doc/teammembership-email-notification.txt	2012-01-27 11:16:26 +0000
@@ -805,7 +805,7 @@
     Subject: Membership change: jdub in ubuntu-team
     <BLANKLINE>
     The membership status of Jeff Waugh (jdub) in the team Ubuntu Team
-    (ubuntu-team) was changed by the user himself from Administrator to
+    (ubuntu-team) was changed by the user from Administrator to
     Approved.
     <http://launchpad.dev/~ubuntu-team>
     ----------------------------------------

=== modified file 'lib/lp/registry/model/persontransferjob.py'
--- lib/lp/registry/model/persontransferjob.py	2012-01-17 21:45:24 +0000
+++ lib/lp/registry/model/persontransferjob.py	2012-01-27 11:16:26 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Job classes related to PersonTransferJob."""
@@ -238,8 +238,7 @@
         if self.reviewer != self.member:
             self.reviewer_name = self.reviewer.unique_displayname
         else:
-            # The user himself changed his self.membership.
-            self.reviewer_name = 'the user himself'
+            self.reviewer_name = 'the user'
 
         if self.last_change_comment:
             comment = ("\n%s said:\n %s\n" % (