Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115098
Change subject: Replaced wfMsg() calls with wfMessage() (finally)
......................................................................
Replaced wfMsg() calls with wfMessage() (finally)
Change-Id: Ie892f004cd1c3f5100e6ae47b7e68455211c3924
---
M ApprovedRevs.hooks.php
M SpecialApprovedRevs.php
2 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs
refs/changes/98/115098/1
diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index 639b8eb..9001201 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -268,14 +268,14 @@
$text = Xml::element(
'span',
array( 'class' => 'approvedAndLatestMsg' ),
- wfMsg( 'approvedrevs-approvedandlatest' )
+ wfMessage( 'approvedrevs-approvedandlatest'
)->parse()
);
} else {
- $text = wfMsgHtml( 'approvedrevs-notlatest' );
+ $text = wfMessage( 'approvedrevs-notlatest' )->parse();
$text .= ' ' . Linker::link(
$title,
- wfMsgHtml( 'approvedrevs-viewlatestrev' ),
+ wfMessage( 'approvedrevs-viewlatestrev'
)->parse(),
array(),
array( 'oldid' => $article->getLatest() ),
array( 'known', 'noclasses' )
@@ -315,7 +315,7 @@
if ( ! empty( $approvedRevID ) && $approvedRevID !=
$latestRevID ) {
ApprovedRevs::addCSS();
global $wgOut;
- $wgOut->addHTML( '<p class="approvedRevsEditWarning">'
. wfMsg( 'approvedrevs-editwarning' ) . "</p>\n" );
+ $wgOut->addHTML( '<p class="approvedRevsEditWarning">'
. wfMessage( 'approvedrevs-editwarning' )->parse() . "</p>\n" );
}
return true;
}
@@ -335,7 +335,7 @@
ApprovedRevs::addCSS();
$preFormHTML .= Xml::element ( 'p',
array( 'style' => 'font-weight: bold' ),
- wfMsg( 'approvedrevs-editwarning' ) ) . "\n";
+ wfMessage( 'approvedrevs-editwarning'
)->parse() ) . "\n";
}
return true;
}
@@ -421,12 +421,12 @@
$url = $title->getLocalUrl(
array( 'action' => 'unapprove' )
);
- $msg = wfMsg( 'approvedrevs-unapprove' );
+ $msg = wfMessage( 'approvedrevs-unapprove'
)->parse();
} else {
$url = $title->getLocalUrl(
array( 'action' => 'approve', 'oldid'
=> $row->rev_id )
);
- $msg = wfMsg( 'approvedrevs-approve' );
+ $msg = wfMessage( 'approvedrevs-approve'
)->parse();
}
$s .= ' (' . Xml::element(
'a',
@@ -466,7 +466,7 @@
$wgOut->addHTML( "\t\t" . Xml::element(
'div',
array( 'class' => 'successbox' ),
- wfMsg( 'approvedrevs-approvesuccess' )
+ wfMessage( 'approvedrevs-approvesuccess' )->parse()
) . "\n" );
$wgOut->addHTML( "\t\t" . Xml::element(
'p',
@@ -508,9 +508,9 @@
// a blank right now or not
global $egApprovedRevsBlankIfUnapproved;
if ( $egApprovedRevsBlankIfUnapproved ) {
- $successMsg = wfMsg( 'approvedrevs-unapprovesuccess2' );
+ $successMsg = wfMessage(
'approvedrevs-unapprovesuccess2' )->parse();
} else {
- $successMsg = wfMsg( 'approvedrevs-unapprovesuccess' );
+ $successMsg = wfMessage(
'approvedrevs-unapprovesuccess' )->parse();
}
global $wgOut;
@@ -577,7 +577,7 @@
* 'Special:AdminLinks', defined by the Admin Links extension.
*/
static function addToAdminLinks( &$admin_links_tree ) {
- $general_section = $admin_links_tree->getSection( wfMsg(
'adminlinks_general' ) );
+ $general_section = $admin_links_tree->getSection( wfMessage(
'adminlinks_general' )->parse() );
$extensions_row = $general_section->getRow( 'extensions' );
if ( is_null( $extensions_row ) ) {
$extensions_row = new ALRow( 'extensions' );
@@ -670,19 +670,19 @@
'oldid' =>
$wgRequest->getInt( 'oldid' )
)
) ),
- wfMsg( 'approvedrevs-approvethisrev' )
+ wfMessage(
'approvedrevs-approvethisrev' )->parse()
) ) );
}
} else {
$wgOut->appendSubtitle(
- htmlspecialchars( wfMsg(
'approvedrevs-blankpageshown' ) ) . ' ' .
+ htmlspecialchars( wfMessage(
'approvedrevs-blankpageshown' )->parse() ) . ' ' .
Xml::element( 'a',
array( 'href' => $title->getLocalUrl(
array(
'oldid' =>
$article->getRevIdFetched()
)
) ),
- wfMsg( 'approvedrevs-viewlatestrev' )
+ wfMessage( 'approvedrevs-viewlatestrev'
)->parse()
)
);
}
diff --git a/SpecialApprovedRevs.php b/SpecialApprovedRevs.php
index 3e6e8b6..2d68226 100644
--- a/SpecialApprovedRevs.php
+++ b/SpecialApprovedRevs.php
@@ -57,17 +57,17 @@
// show the names of the three lists of pages, with the one
// corresponding to the current "mode" not being linked
$approvedPagesTitle = SpecialPage::getTitleFor( 'ApprovedRevs'
);
- $navLine = wfMsg( 'approvedrevs-view' ) . ' ';
+ $navLine = wfMessage( 'approvedrevs-view' )->parse() . ' ';
if ( $this->mMode == '' ) {
$navLine .= Xml::element( 'strong',
null,
- wfMsg( 'approvedrevs-approvedpages' )
+ wfMessage( 'approvedrevs-approvedpages'
)->parse()
);
} else {
$navLine .= Xml::element( 'a',
array( 'href' =>
$approvedPagesTitle->getLocalURL() ),
- wfMsg( 'approvedrevs-approvedpages' )
+ wfMessage( 'approvedrevs-approvedpages'
)->parse()
);
}
@@ -76,12 +76,12 @@
if ( $this->mMode == 'notlatest' ) {
$navLine .= Xml::element( 'strong',
null,
- wfMsg( 'approvedrevs-notlatestpages' )
+ wfMessage( 'approvedrevs-notlatestpages'
)->parse()
);
} else {
$navLine .= Xml::element( 'a',
array( 'href' =>
$approvedPagesTitle->getLocalURL( array( 'show' => 'notlatest' ) ) ),
- wfMsg( 'approvedrevs-notlatestpages' )
+ wfMessage( 'approvedrevs-notlatestpages'
)->parse()
);
}
@@ -90,12 +90,12 @@
if ( $this->mMode == 'unapproved' ) {
$navLine .= Xml::element( 'strong',
null,
- wfMsg( 'approvedrevs-unapprovedpages' )
+ wfMessage( 'approvedrevs-unapprovedpages'
)->parse()
);
} else {
$navLine .= Xml::element( 'a',
array( 'href' =>
$approvedPagesTitle->getLocalURL( array( 'show' => 'unapproved' ) ) ),
- wfMsg( 'approvedrevs-unapprovedpages' )
+ wfMessage( 'approvedrevs-unapprovedpages'
)->parse()
);
}
@@ -231,7 +231,7 @@
'oldid' =>
$result->latest_id
)
) ),
- wfMsg( 'approvedrevs-approvelatest' )
+ wfMessage( 'approvedrevs-approvelatest'
)->parse()
) . ')';
}
@@ -244,7 +244,7 @@
'oldid' => $result->rev_id
)
) ),
- wfMsg( 'approvedrevs-difffromlatest' )
+ wfMessage( 'approvedrevs-difffromlatest'
)->parse()
);
return "$pageLink ($diffLink)";
@@ -255,7 +255,7 @@
array (
'class' => $result->rev_id ==
$result->latest_id ? 'approvedRevIsLatest' : 'approvedRevNotLatest'
),
- wfMsg( 'approvedrevs-revisionnumber',
$result->rev_id )
+ wfMessage( 'approvedrevs-revisionnumber',
$result->rev_id )->parse()
);
// Get data on the most recent approval from the
--
To view, visit https://gerrit.wikimedia.org/r/115098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie892f004cd1c3f5100e6ae47b7e68455211c3924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
