From 77abf11f8a7e4eb2142217ed43c86c3e50d51103 Mon Sep 17 00:00:00 2001 From: S Page Date: Wed, 21 Nov 2012 14:41:58 -0800 Subject: [PATCH] (bug 42215) "Welcome, X" account creation title #2 Follow-up to 8842727 https://gerrit.wikimedia.org/r/#/c/34063/ . Renamed welcomecreation-agora to welcomecreation-msg since it's not agora-specific; actually use this message in SpecialUserLogin.php; improve Qqq docs. ---- Patch 2: fix alignment nit ---- Patch-3: rebased, and remove 'welcomecreation' 'welcomecreation-msg' obsoletes it Change-Id: I3f5552b0e60ea89461744c823c646d35891ecdb6 --- includes/specials/SpecialUserlogin.php | 2 +- languages/messages/MessagesEn.php | 5 +---- languages/messages/MessagesQqq.php | 5 ++--- maintenance/language/messages.inc | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index c9ac825476..fd33ec1f01 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -914,7 +914,7 @@ class LoginForm extends SpecialPage { # Run any hooks; display injected HTML $currentUser = $this->getUser(); $injected_html = ''; - $welcome_creation_msg = 'welcomecreation'; + $welcome_creation_msg = 'welcomecreation-msg'; wfRunHooks( 'UserLoginComplete', array( &$currentUser, &$injected_html ) ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index f5160517b0..81fea502d9 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1069,10 +1069,7 @@ The administrator who locked it offered this explanation: "$3".', You can continue to use {{SITENAME}} anonymously, or you can [$1 log in again] as the same or as a different user. Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache.", 'welcomeuser' => 'Welcome, $1!', -'welcomecreation' => '== Welcome, $1! == -Your account has been created. -Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].', -'welcomecreation-agora' => 'Your account has been created. +'welcomecreation-msg' => 'Your account has been created. Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].', 'yourname' => 'Username:', 'yourpassword' => 'Password:', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index d588a67be7..9dfe974250 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -746,9 +746,8 @@ See also {{msg-mw|protectedinterface}}.', # Login and logout pages 'logouttext' => 'Log out message * $1 is an URL to [[Special:Userlogin]] containing returnto and returntoquery parameters', -'welcomeuser' => 'Text for a welcome heading that users see after registering a user account. $1 is the username of the new user. See [[bugzilla:42215]].', -'welcomecreation' => 'The welcome message users see after registering a user account. $1 is the username of the new user.', -'welcomecreation-agora' => 'A welcome message users see after registering a user account, following a welcomeuser heading. $1 is the username of the new user.', +'welcomeuser' => 'Text for a welcome heading that users see after registering a user account. $1 is the username of the new user. See [[bugzilla:42215]]', +'welcomecreation-msg' => 'A welcome message users see after registering a user account, following a welcomeuser heading. $1 is the username of the new user. Replaces welcomecreation in 1.21wmf5,see [[bugzilla:42215]]', 'yourname' => "In user preferences {{[[Gender|GENDER]]}} is '''NOT''' supported. diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index e2e3940403..2e9ebc232a 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -427,8 +427,7 @@ $wgMessageStructure = array( 'login' => array( 'logouttext', 'welcomeuser', - 'welcomecreation', - 'welcomecreation-agora', + 'welcomecreation-msg', 'yourname', 'yourpassword', 'yourpasswordagain', -- 2.20.1