http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84447
Revision: 84447
Author: aaron
Date: 2011-03-21 14:49:08 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
* Follow-up r84446: use formatNum()
* Pass pager rows to msg in AdvancedReviewLog too
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/specialpages/ConfiguredPages_body.php
trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
Modified: trunk/extensions/FlaggedRevs/specialpages/ConfiguredPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ConfiguredPages_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/ConfiguredPages_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -31,9 +31,10 @@
}
protected function showForm() {
- global $wgOut, $wgScript;
+ global $wgOut, $wgScript, $wgLang;
# Explanatory text
- $wgOut->addWikiMsg( 'configuredpages-list',
$this->pager->getNumRows() );
+ $wgOut->addWikiMsg( 'configuredpages-list',
+ $wgLang->formatNum( $this->pager->getNumRows() ) );
$fields = array();
# Namespace selector
Modified: trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -62,9 +62,10 @@
}
public function showForm() {
- global $wgUser, $wgOut, $wgScript;
+ global $wgUser, $wgOut, $wgScript, $wgLang;
# Explanatory text
- $wgOut->addWikiMsg( 'pendingchanges-list',
$this->pager->getNumRows() );
+ $wgOut->addWikiMsg( 'pendingchanges-list',
+ $wgLang->formatNum( $this->pager->getNumRows() ) );
$form = Html::openElement( 'form', array( 'name' =>
'pendingchanges',
'action' => $wgScript, 'method' => 'get' ) ) . "\n";
Modified: trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -57,9 +57,10 @@
}
public function showForm() {
- global $wgOut, $wgScript;
+ global $wgOut, $wgScript, $wgLang;
// Add explanatory text
- $wgOut->addWikiMsg( 'problemchanges-list',
$this->pager->getNumRows() );
+ $wgOut->addWikiMsg( 'problemchanges-list',
+ $wgLang->formatNum( $this->pager->getNumRows() ) );
$form = Html::openElement( 'form', array( 'name' =>
'problemchanges',
'action' => $wgScript, 'method' => 'get' ) ) . "\n";
Modified: trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -11,10 +11,9 @@
}
public function execute( $par ) {
- global $wgOut, $wgUser, $wgRequest, $wgFlaggedRevsOversightAge;
+ global $wgOut, $wgUser, $wgRequest, $wgLang,
$wgFlaggedRevsOversightAge;
$this->setHeaders();
- $wgOut->addHTML( wfMsgExt( 'qualityoversight-list', array(
'parse' ) ) );
$this->namespace = $wgRequest->getInt( 'namespace' );
$this->level = $wgRequest->getIntOrNull( 'level' );
@@ -24,28 +23,35 @@
# Check if the user exists
$usertitle = Title::makeTitleSafe( NS_USER, $this->user );
$u = $usertitle ? User::idFromName( $this->user ) : false;
-
- # Show options
- $this->showForm();
-
+
+ # Are the dropdown params given even valid?
$actions = $this->getActions();
if ( empty( $actions ) ) {
+ $wgOut->addWikiMsg( 'qualityoversight-list', 0 );
$wgOut->addWikiMsg( 'logempty' );
return;
}
-
- $dbr = wfGetDB( DB_SLAVE );
+
# Get extra query conds
$conds = array( 'log_namespace' => $this->namespace,
'log_action' => $actions );
# Get cutoff time (mainly for performance)
if ( !$u ) {
+ $dbr = wfGetDB( DB_SLAVE );
$cutoff_unixtime = time() - $wgFlaggedRevsOversightAge;
$cutoff = $dbr->addQuotes( $dbr->timestamp(
$cutoff_unixtime ) );
$conds[] = "log_timestamp >= $cutoff";
}
+
# Create a LogPager item to get the results and a LogEventsList
item to format them...
$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
$pager = new LogPager( $loglist, 'review', $this->user, '', '',
$conds );
+
+ # Explanatory text
+ $wgOut->addWikiMsg( 'qualityoversight-list',
+ $wgLang->formatNum( $pager->getNumRows() ) );
+ # Show form options
+ $this->showForm();
+
# Insert list
$logBody = $pager->getBody();
if ( $logBody ) {
Modified: trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -34,11 +34,12 @@
}
public function showForm() {
- global $wgOut, $wgScript;
+ global $wgOut, $wgScript, $wgLang;
// Text to explain level select (if there are several levels)
if ( FlaggedRevs::qualityVersions() ) {
- $wgOut->addWikiMsg( 'reviewedpages-list',
$this->pager->getNumRows() );
+ $wgOut->addWikiMsg( 'reviewedpages-list',
+ $wgLang->formatNum( $this->pager->getNumRows()
) );
}
$form = Html::openElement( 'form',
array( 'name' => 'reviewedpages', 'action' =>
$wgScript, 'method' => 'get' ) );
Modified: trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -31,8 +31,9 @@
}
protected function showForm() {
- global $wgOut, $wgScript;
- $wgOut->addWikiMsg( 'stablepages-list',
$this->pager->getNumRows() );
+ global $wgOut, $wgScript, $wgLang;
+ $wgOut->addWikiMsg( 'stablepages-list',
+ $wgLang->formatNum( $this->pager->getNumRows() ) );
$fields = array();
# Namespace selector
if ( count( FlaggedRevs::getReviewNamespaces() ) > 1 ) {
Modified: trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
2011-03-21 14:32:07 UTC (rev 84446)
+++ trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
2011-03-21 14:49:08 UTC (rev 84447)
@@ -44,7 +44,7 @@
protected function showForm() {
global $wgOut, $wgLang, $wgScript;
# Add explanatory text
- $wgOut->addWikiMsg( 'unreviewedpages-list',
$this->pager->getNumRows() );
+ $wgOut->addWikiMsg( 'unreviewedpages-list', $wgLang->formatNum(
$this->pager->getNumRows() ) );
# show/hide links
$showhide = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
