From d7e40dbe00163f7aec53bacb7537aac02e9657b0 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 21 Feb 2012 21:54:27 +0000
Subject: [PATCH] Effectively revert r112042

Followup r112045, remove the irc key name changes
---
 includes/logging/LogFormatter.php | 10 +-------
 languages/messages/MessagesEn.php | 38 ++++++++++++++-----------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 6ea6777d7d..cdd3a708b1 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -149,7 +149,6 @@ class LogFormatter {
 	 * @return string text
 	 */
 	public function getIRCActionText() {
-		$this->irctext = true;
 		$this->plaintext = true;
 		$text = $this->getActionText();
 
@@ -171,7 +170,6 @@ class LogFormatter {
 		}
 
 		$this->plaintext = false;
-		$this->irctext = false;
 		return $text;
 	}
 
@@ -218,14 +216,8 @@ class LogFormatter {
 	protected function getMessageKey() {
 		$type = $this->entry->getType();
 		$subtype = $this->entry->getSubtype();
-		if( $this->irctext ) {
-			$key = "logentry-irc-$type-$subtype";
-		}
-		else {
-			$key = "logentry-$type-$subtype";
-		}
 
-		return $key;
+		return "logentry-$type-$subtype";
 	}
 
 	/**
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a552cdfd93..0feaa2f3c8 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4718,27 +4718,23 @@ This site is experiencing technical difficulties.',
 'newuserlog-byemail'                  => 'password sent by e-mail',
 
 # For IRC, see bug 34508.  Do not change
-'logentry-irc-delete-delete'              => 'deleted "$3"',
-'logentry-irc-delete-restore'             => 'restored "$3"',
-'logentry-irc-delete-event'               => '$1 changed visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4',
-'logentry-irc-delete-revision'            => '$1 changed visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4',
-'logentry-irc-delete-event-legacy'        => '$1 changed visibility of log events on $3',
-'logentry-irc-delete-revision-legacy'     => '$1 changed visibility of revisions on page $3',
-'logentry-irc-suppress-delete'            => '$1 suppressed page $3',
-'logentry-irc-suppress-event'             => '$1 secretly changed visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4',
-'logentry-irc-suppress-revision'          => '$1 secretly changed visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4',
-'logentry-irc-suppress-event-legacy'      => '$1 secretly changed visibility of log events on $3',
-'logentry-irc-suppress-revision-legacy'   => '$1 secretly changed visibility of revisions on page $3',
-'logentry-irc-move-move'                  => '$1 moved page $3 to $4',
-'logentry-irc-move-move-noredirect'       => '$1 moved page $3 to $4 without leaving a redirect',
-'logentry-irc-move-move_redir'            => 'moved $3 to $4 over redirect',
-'logentry-irc-move-move_redir-noredirect' => '$1 moved page $3 to $4 over a redirect without leaving a redirect',
-'logentry-irc-patrol-patrol'              => '$1 marked revision $4 of page $3 patrolled',
-'logentry-irc-patrol-patrol-auto'         => '$1 automatically marked revision $4 of page $3 patrolled',
-'logentry-irc-newusers-newusers'          => '$1 created a user account',
-'logentry-irc-newusers-create'            => '$1 created a user account',
-'logentry-irc-newusers-create2'           => '$1 created a user account $3',
-'logentry-irc-newusers-autocreate'        => 'Account $1 was created automatically',
+'revdelete-logentry'          => 'changed revision visibility of "[[$1]]"',
+'logdelete-logentry'          => 'changed event visibility of "[[$1]]"',
+'revdelete-content'           => 'content',
+'revdelete-summary'           => 'edit summary',
+'revdelete-uname'             => 'username',
+'revdelete-restricted'        => 'applied restrictions to administrators',
+'revdelete-unrestricted'      => 'removed restrictions for administrators',
+'revdelete-hid'               => 'hid $1',
+'revdelete-unhid'             => 'unhid $1',
+'revdelete-log-message'       => '$1 for $2 {{PLURAL:$2|revision|revisions}}',
+'logdelete-log-message'       => '$1 for $2 {{PLURAL:$2|event|events}}',
+'deletedarticle'              => 'deleted "[[$1]]"',
+'suppressedarticle'           => 'suppressed "[[$1]]"',
+'undeletedarticle'            => 'restored "[[$1]]"',
+'patrol-log-line'             => 'marked $1 of $2 patrolled $3',
+'patrol-log-auto'             => '(automatic)',
+'patrol-log-diff'             => 'revision $1',
 
 # Feedback
 'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug].
-- 
2.20.1