| Index: trunk/phase3/includes/logging/LogFormatter.php |
| — | — | @@ -149,7 +149,6 @@ |
| 150 | 150 | * @return string text |
| 151 | 151 | */ |
| 152 | 152 | public function getIRCActionText() { |
| 153 | | - $this->irctext = true; |
| 154 | 153 | $this->plaintext = true; |
| 155 | 154 | $text = $this->getActionText(); |
| 156 | 155 | |
| — | — | @@ -171,7 +170,6 @@ |
| 172 | 171 | } |
| 173 | 172 | |
| 174 | 173 | $this->plaintext = false; |
| 175 | | - $this->irctext = false; |
| 176 | 174 | return $text; |
| 177 | 175 | } |
| 178 | 176 | |
| — | — | @@ -218,14 +216,8 @@ |
| 219 | 217 | protected function getMessageKey() { |
| 220 | 218 | $type = $this->entry->getType(); |
| 221 | 219 | $subtype = $this->entry->getSubtype(); |
| 222 | | - if( $this->irctext ) { |
| 223 | | - $key = "logentry-irc-$type-$subtype"; |
| 224 | | - } |
| 225 | | - else { |
| 226 | | - $key = "logentry-$type-$subtype"; |
| 227 | | - } |
| 228 | 220 | |
| 229 | | - return $key; |
| | 221 | + return "logentry-$type-$subtype"; |
| 230 | 222 | } |
| 231 | 223 | |
| 232 | 224 | /** |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4718,27 +4718,23 @@ |
| 4719 | 4719 | 'newuserlog-byemail' => 'password sent by e-mail', |
| 4720 | 4720 | |
| 4721 | 4721 | # For IRC, see bug 34508. Do not change |
| 4722 | | -'logentry-irc-delete-delete' => 'deleted "$3"', |
| 4723 | | -'logentry-irc-delete-restore' => 'restored "$3"', |
| 4724 | | -'logentry-irc-delete-event' => '$1 changed visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4', |
| 4725 | | -'logentry-irc-delete-revision' => '$1 changed visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4', |
| 4726 | | -'logentry-irc-delete-event-legacy' => '$1 changed visibility of log events on $3', |
| 4727 | | -'logentry-irc-delete-revision-legacy' => '$1 changed visibility of revisions on page $3', |
| 4728 | | -'logentry-irc-suppress-delete' => '$1 suppressed page $3', |
| 4729 | | -'logentry-irc-suppress-event' => '$1 secretly changed visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4', |
| 4730 | | -'logentry-irc-suppress-revision' => '$1 secretly changed visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4', |
| 4731 | | -'logentry-irc-suppress-event-legacy' => '$1 secretly changed visibility of log events on $3', |
| 4732 | | -'logentry-irc-suppress-revision-legacy' => '$1 secretly changed visibility of revisions on page $3', |
| 4733 | | -'logentry-irc-move-move' => '$1 moved page $3 to $4', |
| 4734 | | -'logentry-irc-move-move-noredirect' => '$1 moved page $3 to $4 without leaving a redirect', |
| 4735 | | -'logentry-irc-move-move_redir' => 'moved $3 to $4 over redirect', |
| 4736 | | -'logentry-irc-move-move_redir-noredirect' => '$1 moved page $3 to $4 over a redirect without leaving a redirect', |
| 4737 | | -'logentry-irc-patrol-patrol' => '$1 marked revision $4 of page $3 patrolled', |
| 4738 | | -'logentry-irc-patrol-patrol-auto' => '$1 automatically marked revision $4 of page $3 patrolled', |
| 4739 | | -'logentry-irc-newusers-newusers' => '$1 created a user account', |
| 4740 | | -'logentry-irc-newusers-create' => '$1 created a user account', |
| 4741 | | -'logentry-irc-newusers-create2' => '$1 created a user account $3', |
| 4742 | | -'logentry-irc-newusers-autocreate' => 'Account $1 was created automatically', |
| | 4722 | +'revdelete-logentry' => 'changed revision visibility of "[[$1]]"', |
| | 4723 | +'logdelete-logentry' => 'changed event visibility of "[[$1]]"', |
| | 4724 | +'revdelete-content' => 'content', |
| | 4725 | +'revdelete-summary' => 'edit summary', |
| | 4726 | +'revdelete-uname' => 'username', |
| | 4727 | +'revdelete-restricted' => 'applied restrictions to administrators', |
| | 4728 | +'revdelete-unrestricted' => 'removed restrictions for administrators', |
| | 4729 | +'revdelete-hid' => 'hid $1', |
| | 4730 | +'revdelete-unhid' => 'unhid $1', |
| | 4731 | +'revdelete-log-message' => '$1 for $2 {{PLURAL:$2|revision|revisions}}', |
| | 4732 | +'logdelete-log-message' => '$1 for $2 {{PLURAL:$2|event|events}}', |
| | 4733 | +'deletedarticle' => 'deleted "[[$1]]"', |
| | 4734 | +'suppressedarticle' => 'suppressed "[[$1]]"', |
| | 4735 | +'undeletedarticle' => 'restored "[[$1]]"', |
| | 4736 | +'patrol-log-line' => 'marked $1 of $2 patrolled $3', |
| | 4737 | +'patrol-log-auto' => '(automatic)', |
| | 4738 | +'patrol-log-diff' => 'revision $1', |
| 4743 | 4739 | |
| 4744 | 4740 | # Feedback |
| 4745 | 4741 | 'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug]. |