Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146053
Change subject: Add plural to message 'rcnotefrom'
......................................................................
Add plural to message 'rcnotefrom'
Change-Id: I495d19258205d8713a19aa934a7657aecbe240d4
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
5 files changed, 14 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/146053/1
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index ad1ee36..56e2c7b 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -53,7 +53,7 @@
$opts = $this->getOptions();
if ( $rows === false ) {
if ( !$this->including() ) {
- $this->doHeader( $opts );
+ $this->doHeader( $opts, 0 );
}
return;
@@ -326,7 +326,7 @@
public function webOutput( $rows, $opts ) {
if ( !$this->including() ) {
$this->outputFeedLinks();
- $this->doHeader( $opts );
+ $this->doHeader( $opts, $rows->numRows() );
}
$this->outputChangesList( $rows, $opts );
@@ -351,9 +351,10 @@
* Return the text to be displayed above the changes
*
* @param FormOptions $opts
+ * @param int $numRows
* @return string XHTML
*/
- public function doHeader( $opts ) {
+ public function doHeader( $opts, $numRows ) {
$this->setTopText( $opts );
// @todo Lots of stuff should be done here.
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index f770307..8866d66 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -353,9 +353,10 @@
* Return the text to be displayed above the changes
*
* @param FormOptions $opts
+ * @param int $numRows
* @return string XHTML
*/
- public function doHeader( $opts ) {
+ public function doHeader( $opts, $numRows ) {
global $wgScript;
$this->setTopText( $opts );
@@ -365,7 +366,7 @@
$panel = array();
$panel[] = self::makeLegend( $this->getContext() );
- $panel[] = $this->optionsPanel( $defaults, $nondefaults );
+ $panel[] = $this->optionsPanel( $defaults, $nondefaults,
$numRows );
$panel[] = '<hr />';
$extraOpts = $this->getExtraOptions( $opts );
@@ -640,9 +641,10 @@
*
* @param array $defaults
* @param array $nondefaults
+ * @param int $numRows
* @return string
*/
- function optionsPanel( $defaults, $nondefaults ) {
+ function optionsPanel( $defaults, $nondefaults, $numRows ) {
global $wgRCLinkLimits, $wgRCLinkDays;
$options = $nondefaults + $defaults;
@@ -659,7 +661,7 @@
$note .= $this->msg( 'rcnotefrom' )->numParams(
$options['limit'] )->params(
$lang->userTimeAndDate( $options['from'], $user
),
$lang->userDate( $options['from'], $user ),
- $lang->userTime( $options['from'], $user )
)->parse() . '<br />';
+ $lang->userTime( $options['from'], $user )
)->numParams( $numRows )->parse() . '<br />';
}
# Sort data for display and make sure it's unique after we've
added user data.
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index 21a1f9b..24e748e 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -391,9 +391,10 @@
* Return the text to be displayed above the changes
*
* @param FormOptions $opts
+ * @param int $numRows
* @return string XHTML
*/
- public function doHeader( $opts ) {
+ public function doHeader( $opts, $numRows ) {
$user = $this->getUser();
$this->getOutput()->addSubtitle(
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a8c6055..a39be80 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1191,7 +1191,7 @@
"recentchanges-legend-bot": "{{int:recentchanges-label-bot}}",
"recentchanges-legend-unpatrolled":
"{{int:recentchanges-label-unpatrolled}}",
"recentchanges-legend-plusminus": "(<em>±123</em>)",
- "rcnotefrom": "Below are the changes since <strong>$2</strong> (up to
<strong>$1</strong> shown).",
+ "rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since
<strong>$2</strong> (up to <strong>$1</strong> shown).",
"rclistfrom": "Show new changes starting from $2, $3",
"rcshowhideminor": "$1 minor edits",
"rcshowhideminor-show": "Show",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d7dfd87..afbe25f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1353,7 +1353,7 @@
"recentchanges-legend-bot": "Used as legend on
[[Special:RecentChanges]] and [[Special:Watchlist]].\n\nRefers to
{{msg-mw|Recentchanges-label-bot}}.",
"recentchanges-legend-unpatrolled": "Used as legend on
[[Special:RecentChanges]] and [[Special:Watchlist]].\n\nRefers to
{{msg-mw|Recentchanges-label-unpatrolled}}.",
"recentchanges-legend-plusminus": "{{optional}}\nA plus/minus sign with
a number for the legend.",
- "rcnotefrom": "This message is displayed at [[Special:RecentChanges]]
when viewing recentchanges from some specific time.\n\nThe corresponding
message is {{msg-mw|Rclistfrom}} (split into date and time).\n\nParameters:\n*
$1 - the maximum number of changes that are displayed\n* $2 - a date and
time\n* $3 - (Optional) a date\n* $4 - (Optional) a time",
+ "rcnotefrom": "This message is displayed at [[Special:RecentChanges]]
when viewing recentchanges from some specific time.\n\nThe corresponding
message is {{msg-mw|Rclistfrom}} (split into date and time).\n\nParameters:\n*
$1 - the maximum number of changes that are displayed\n* $2 - a date and
time\n* $3 - (Optional) a date\n* $4 - (Optional) a time\n* $5 - Number of
changes are displayed, for use with PLURAL",
"rclistfrom": "Used on [[Special:RecentChanges]]. Parameters:\n* $1 -
(Currently not use) date and time. The date and the time adds to the rclistfrom
description.\n* $2 - time. The time adds to the rclistfrom link description
(with split of date and time).\n* $3 - date. The date adds to the rclistfrom
link description (with split of date and time).\n\nThe corresponding message is
{{msg-mw|Rcnotefrom}}.",
"rcshowhideminor": "Option text in [[Special:RecentChanges]].
Parameters:\n* $1 - the \"show/hide\" command, with the text taken from either
{{msg-mw|rcshowhideminor-show}} or
{{msg-mw|rcshowhideminor-hide}}\n{{Identical|Minor edit}}",
"rcshowhideminor-show": "{{doc-actionlink}}\nOption text in
[[Special:RecentChanges]] in conjunction with
{{msg-mw|rcshowhideminor}}.\n\nSee also:\n*
{{msg-mw|rcshowhideminor-hide}}\n{{Identical|Show}}",
--
To view, visit https://gerrit.wikimedia.org/r/146053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I495d19258205d8713a19aa934a7657aecbe240d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
