diff options
| author | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
| commit | 9f0715a9935966f3ec483bccc476d5baf3324b3c (patch) | |
| tree | 9874247927e5e24044c75a48a9c04e427b0ba477 /classes/User.php | |
| parent | 004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (diff) | |
| parent | b17fc0ca5b90d2cdc957ebc4870fbd2791b9e1b9 (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/User.php b/classes/User.php index 314b80531..70e09c1dc 100644 --- a/classes/User.php +++ b/classes/User.php @@ -355,11 +355,12 @@ class User extends Memcached_DataObject __FILE__); } else { $notice = Notice::saveNew($welcomeuser->id, + // TRANS: Notice given on user registration. + // TRANS: %1$s is the sitename, $2$s is the registering user's nickname. sprintf(_('Welcome to %1$s, @%2$s!'), common_config('site', 'name'), $user->nickname), 'system'); - } } @@ -370,7 +371,6 @@ class User extends Memcached_DataObject } // Things we do when the email changes - function emailChanged() { @@ -519,7 +519,7 @@ class User extends Memcached_DataObject if ($this->id == $other->id) { common_log(LOG_WARNING, sprintf( - "Profile ID %d (%s) tried to block his or herself.", + "Profile ID %d (%s) tried to block themself.", $this->id, $this->nickname ) |