r112128 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112127‎ | r112128 | r112129 >
Date:18:29, 22 February 2012
Author:robla
Status:resolved (Comments)
Tags:
Comment:
r112045/bug 34508: Make upload/upload and overwrite match old IRC format
Modified paths:
  • /trunk/phase3/includes/logging/LogFormatter.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/logging/LogFormatter.php
@@ -240,6 +240,17 @@
241241 }
242242 break;
243243
 244+ case 'upload':
 245+ switch( $entry->getSubtype() ) {
 246+ case 'upload':
 247+ $text = wfMsgExt( 'uploadedimage', $msgOpts, $target );
 248+ break;
 249+ case 'overwrite':
 250+ $text = wfMsgExt( 'overwroteimage', $msgOpts, $target );
 251+ break;
 252+ }
 253+ break;
 254+
244255 // case 'suppress' --private log -- aaron (sign your messages so we know who to blame in a few years :-D)
245256 // default:
246257 }
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -4742,6 +4742,8 @@
47434743 'newuserlog-autocreate-entry' => 'Account created automatically',
47444744 'suppressedarticle' => 'suppressed "[[$1]]"',
47454745 'deletedarticle' => 'deleted "[[$1]]"',
 4746+'uploadedimage' => 'uploaded "[[$1]]"',
 4747+'overwroteimage' => 'uploaded a new version of "[[$1]]"',
47464748
47474749 # Feedback
47484750 'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug].
@@ -4796,5 +4798,4 @@
47974799 'api-error-unknownerror' => 'Unknown error: "$1".',
47984800 'api-error-uploaddisabled' => 'Uploading is disabled on this wiki.',
47994801 'api-error-verification-error' => 'This file might be corrupt, or have the wrong extension.',
4800 -
48014802 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r112130MFT r112079, r112128aaron18:40, 22 February 2012
r112141r112128: Add new message keys to maintenance files otherwise the next run of ...raymond20:00, 22 February 2012
r112353r112128: Comment out dupe message keysraymond20:31, 24 February 2012
r112415basic tests for bug 34508hashar21:22, 25 February 2012
r112561[IRC Log Message] Fix for protect/protect and protect/modify...krinkle01:56, 28 February 2012
r112639MFT r112045, r112046, r112049, r112061, r112066, r112079, r112128reedy21:08, 28 February 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r112042Part 1 for bug 34508, commit all the messages added in patch 3reedy21:12, 21 February 2012
r112045First merge of the rest of the code from bug 34508 patch 1 and patch 3reedy21:26, 21 February 2012
r112061Bug 34508 - [Regression] IRC string output for log messages no longer compatible...reedy23:38, 21 February 2012

Comments

#Comment by Nikerabbit (talk | contribs)   19:07, 22 February 2012

Don't forget messages.inc!

#Comment by Raymond (talk | contribs)   19:49, 23 February 2012

'uploadedimage', 'overwroteimage' and 'newuserlog-byemail' are dupe in MessagesEn.php now. These messages are really used (I think) and needs to be translated.

#Comment by Raymond (talk | contribs)   20:37, 24 February 2012

Message keys commented out for the moment with r112353

Status & tagging log