https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112130
Revision: 112130
Author: aaron
Date: 2012-02-22 18:40:11 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
MFT r112079, r112128
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/logging/LogFormatter.php
branches/wmf/1.19wmf1/languages/messages/MessagesEn.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/languages/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128
Modified: branches/wmf/1.19wmf1/includes/logging/LogFormatter.php
===================================================================
--- branches/wmf/1.19wmf1/includes/logging/LogFormatter.php 2012-02-22
18:37:05 UTC (rev 112129)
+++ branches/wmf/1.19wmf1/includes/logging/LogFormatter.php 2012-02-22
18:40:11 UTC (rev 112130)
@@ -173,24 +173,23 @@
$this->plaintext = true;
$text = $this->getActionText();
- // wfRunHooks( 'LogEntry::publish', array( $this, $formatter,
&$actionText ) );
- // function efLegacyLogsIrcFormat( $entry, $formatter, &$text )
{
-
$entry = $this->entry;
$parameters = $entry->getParameters();
+ // @see LogPage::actionText()
+ $msgOpts = array( 'parsemag', 'escape', 'replaceafter',
'content' );
// Text of title the action is aimed at.
- $target = $entry->getTarget()->getText() ;
+ $target = $entry->getTarget()->getPrefixedText() ;
$text = null;
switch( $entry->getType() ) {
case 'move':
switch( $entry->getSubtype() ) {
case 'move':
$movesource =
$parameters['4::target'];
- $text = wfMsg( '1movedto2',
$target, $movesource );
+ $text = wfMsgExt( '1movedto2',
$msgOpts, $target, $movesource );
break;
case 'move_redir':
$movesource =
$parameters['4::target'];
- $text = wfMsg(
'1movedto2_redir', $target, $movesource );
+ $text = wfMsgExt(
'1movedto2_redir', $msgOpts, $target, $movesource );
break;
case 'move-noredirect':
break;
@@ -202,10 +201,10 @@
case 'delete':
switch( $entry->getSubtype() ) {
case 'delete':
- $text = wfMsg(
'deletedarticle', $target );
+ $text = wfMsgExt(
'deletedarticle', $msgOpts, $target );
break;
case 'restore':
- $text = wfMsg(
'undeletedarticle', $target );
+ $text = wfMsgExt(
'undeletedarticle', $msgOpts, $target );
break;
//case 'revision': // Revision deletion
//case 'event': // Log deletion
@@ -217,26 +216,10 @@
case 'patrol':
//
https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/PatrolLog.php?&pathrev=97495&r1=97494&r2=97495
// Create a diff link to the patrolled revision
- $diffLink = Linker::link(
- $target,
- htmlspecialchars( wfMsg(
'patrol-log-diff', $parameters['4::curid']) ),
- array(),
- /*query parameters */ array(
'oldid'=>$parameters['4::curid'], 'diff' => 'prev' ),
- array( 'known', 'noclasses' )
- );
- $link = Linker::link( $entry->getTarget() );
-
if ( $entry->getSubtype() === 'patrol' ) {
- // 'patrol-log-line' =>
'marked $1 of $2 patrolled $3',
- // 'logentry-irc-patrol-patrol'
=> '$1 marked revision $4 of page $3 patrolled',
-
- $text = wfMsg( 'patrol-log-line',
$diffLink, $link );
- } elseif ( $entry->getSubtype() ===
'patrol-auto' ) {
- // 'patrol-log-line' =>
'marked $1 of $2 patrolled $3',
- // 'patrol-log-auto' =>
'(automatic)',
- // 'logentry-irc-patrol-patrol-auto'
=> '$1 automatically marked revision $4 of page $3 patrolled',
- // How is this done with old messages?
Some abomination to man?
- $text = wfMsg( 'patrol-log-line-auto',
$diffLink, $link );
+ $diffLink = htmlspecialchars(
+ wfMsgForContent(
'patrol-log-diff', $parameters['4::curid'] ) );
+ $text = wfMsgForContent(
'patrol-log-line', $diffLink, "[[$target]]", "" );
} else {
// broken??
}
@@ -246,17 +229,28 @@
switch( $entry->getSubtype() ) {
case 'newusers':
case 'create':
- $text = wfMsg(
'newuserlog-create-entry' /* no params */ );
+ $text = wfMsgExt(
'newuserlog-create-entry', $msgOpts /* no params */ );
break;
case 'create2':
- $text = wfMsg(
'newuserlog-create2-entry', $target );
+ $text = wfMsgExt(
'newuserlog-create2-entry', $msgOpts, $target );
break;
case 'autocreate':
- $text = wfMsg(
'newuserlog-autocreate-entry' /* no params */ );
+ $text = wfMsgExt(
'newuserlog-autocreate-entry', $msgOpts /* no params */ );
break;
}
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:
}
Property changes on: branches/wmf/1.19wmf1/languages
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/languages:100352-107913
/branches/REL1_15/phase3/languages:51646
/branches/REL1_17/phase3/languages:81445,81448
/branches/new-installer/phase3/languages:43664-66004
/branches/nikola/phase3/languages:85224,85239,85308
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:112049,112061-112063,112065-112066,112070-112071
+ /branches/JSTesting/languages:100352-107913
/branches/REL1_15/phase3/languages:51646
/branches/REL1_17/phase3/languages:81445,81448
/branches/new-installer/phase3/languages:43664-66004
/branches/nikola/phase3/languages:85224,85239,85308
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:112049,112061-112063,112065-112066,112070-112071,112128
Modified: branches/wmf/1.19wmf1/languages/messages/MessagesEn.php
===================================================================
--- branches/wmf/1.19wmf1/languages/messages/MessagesEn.php 2012-02-22
18:37:05 UTC (rev 112129)
+++ branches/wmf/1.19wmf1/languages/messages/MessagesEn.php 2012-02-22
18:40:11 UTC (rev 112130)
@@ -4733,6 +4733,8 @@
'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].
@@ -4787,5 +4789,4 @@
'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.',
-
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
