r112045/bug 34508: Make upload/upload and overwrite match old IRC format

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index f7ceee2..ab8b307 100644 (file)
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -240,6 +240,17 @@ class LogFormatter {
                                }
                                break;
 
+                       case 'upload':
+                               switch( $entry->getSubtype() ) {
+                                       case 'upload':
+                                               $text = wfMsgExt( 'uploadedimage', $msgOpts, $target );
+                                               break;
+                                       case 'overwrite':
+                                               $text = wfMsgExt( 'overwroteimage', $msgOpts, $target );
+                                               break;
+                               }
+                               break;
+
                        // case 'suppress' --private log -- aaron  (sign your messages so we know who to blame in a few years :-D)
                        // default:
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 28ff4e7..2efd882 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4742,6 +4742,8 @@ This site is experiencing technical difficulties.',
 'newuserlog-autocreate-entry' => 'Account created automatically',
 'suppressedarticle'           => 'suppressed "[[$1]]"',
 'deletedarticle'              => 'deleted "[[$1]]"',
+'uploadedimage'               => 'uploaded "[[$1]]"',
+'overwroteimage'              => 'uploaded a new version of "[[$1]]"',
 
 # Feedback
 'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug].
@@ -4796,5 +4798,4 @@ Otherwise, you can use the easy form below. Your comment will be added to the pa
 'api-error-unknownerror'                  => 'Unknown error: "$1".',
 'api-error-uploaddisabled'                => 'Uploading is disabled on this wiki.',
 'api-error-verification-error'            => 'This file might be corrupt, or have the wrong extension.',
-
 );