From 5ad4536ef249d7ae9b48909ea63d485c66a04539 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Mon, 26 Sep 2011 15:12:44 +0000
Subject: [PATCH] Converted display part of new user log to new system

---
 includes/Setup.php                |  6 ++----
 languages/messages/MessagesEn.php | 14 +++++++-------
 maintenance/language/messages.inc | 10 +++++-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index fa7cf170f3..66f1793d83 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -315,10 +315,8 @@ if ( $wgNewUserLog ) {
 	$wgLogTypes[]                        = 'newusers';
 	$wgLogNames['newusers']              = 'newuserlogpage';
 	$wgLogHeaders['newusers']            = 'newuserlogpagetext';
-	$wgLogActions['newusers/newusers']   = 'newuserlogentry'; // For compatibility with older log entries
-	$wgLogActions['newusers/create']     = 'newuserlog-create-entry';
-	$wgLogActions['newusers/create2']    = 'newuserlog-create2-entry';
-	$wgLogActions['newusers/autocreate'] = 'newuserlog-autocreate-entry';
+	# newusers, create, create2, autocreate
+	$wgLogActionsHandlers['newusers/*']  = 'LogFormatter';
 }
 
 if ( $wgCookieSecure === 'detect' ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 6c65ad371f..6e9f1518dd 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2645,13 +2645,8 @@ Supported protocols: <tt>$1</tt>',
 'activeusers-noresult'   => 'No users found.',
 
 # Special:Log/newusers
-'newuserlogpage'              => 'User creation log',
-'newuserlogpagetext'          => 'This is a log of user creations.',
-'newuserlogentry'             => '', # do not translate or duplicate this message to other languages
-'newuserlog-byemail'          => 'password sent by e-mail',
-'newuserlog-create-entry'     => 'New user account',
-'newuserlog-create2-entry'    => 'created new account $1',
-'newuserlog-autocreate-entry' => 'Account created automatically',
+'newuserlogpage'     => 'User creation log',
+'newuserlogpagetext' => 'This is a log of user creations.',
 
 # Special:ListGroupRights
 'listgrouprights'                      => 'User group rights',
@@ -4658,5 +4653,10 @@ This site is experiencing technical difficulties.',
 'logentry-move-move_redir-noredirect' => '$1 {{GENDER:$2|moved}} page $3 to $4 over a redirect without leaving a redirect',
 'logentry-patrol-patrol'              => '$1 {{GENDER:$2|marked}} revision $4 of page $3 patrolled',
 'logentry-patrol-patrol-auto'         => '$1 automatically {{GENDER:$2|marked}} revision $4 of page $3 patrolled',
+'logentry-newusers-newusers'          => '',
+'logentry-newusers-create'            => '$1 {{GENDER:$2|created}} a user account',
+'logentry-newusers-create2'           => '$1 {{GENDER:$2|created}} a user account $3',
+'logentry-newusers-autocreate'        => 'Account $1 was {{GENDER:$2|created}} automatically',
+'newuserlog-byemail'                  => 'password sent by e-mail',
 
 );
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index f94e41fa7c..d53ada215f 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1738,11 +1738,6 @@ $wgMessageStructure = array(
 	'newuserlog' => array(
 		'newuserlogpage',
 		'newuserlogpagetext',
-		'newuserlogentry',
-		'newuserlog-byemail',
-		'newuserlog-create-entry',
-		'newuserlog-create2-entry',
-		'newuserlog-autocreate-entry',
 	),
 	'listgrouprights' => array(
 		'listgrouprights',
@@ -3524,6 +3519,11 @@ $wgMessageStructure = array(
 		'logentry-move-move_redir-noredirect',
 		'logentry-patrol-patrol',
 		'logentry-patrol-patrol-auto',
+		'logentry-newusers-newusers',
+		'logentry-newusers-create',
+		'logentry-newusers-create2',
+		'logentry-newusers-autocreate',
+		'newuserlog-byemail',
 	),
 );
 
-- 
2.20.1