[MediaWiki-commits] [Gerrit] Restore the number of rows shown on Special:Watchlist - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Restore the number of rows shown on Special:Watchlist
..
Restore the number of rows shown on Special:Watchlist
This reverts the result of Iada3a93762dd25fdaf35fb707304abc40bd4a5b1.
This is a manual cherry pick of
Ie722c509a6ad1346b1624abee778f4cbdc79d457,
Ibb23838843a9a1cb8bb23347c3b2de7437861ae0 and necessary parts of
I495d19258205d8713a19aa934a7657aecbe240d4.
Contains only translations of message wlnote which was exported today
with Id59d00bd9402da7fd03a34bd6d0ceb9bd2d00024.
Bug: 62017
Change-Id: I5549e25f22f96eb69059b4d298bc50d11c72f1f1
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M languages/i18n/ar.json
M languages/i18n/ast.json
M languages/i18n/be-tarask.json
M languages/i18n/bn.json
M languages/i18n/ca.json
M languages/i18n/ce.json
M languages/i18n/cs.json
M languages/i18n/cy.json
M languages/i18n/da.json
M languages/i18n/de.json
M languages/i18n/diq.json
M languages/i18n/dsb.json
M languages/i18n/en.json
M languages/i18n/eo.json
M languages/i18n/es.json
M languages/i18n/et.json
M languages/i18n/fa.json
M languages/i18n/fi.json
M languages/i18n/fr.json
M languages/i18n/frr.json
M languages/i18n/gl.json
M languages/i18n/he.json
M languages/i18n/hi.json
M languages/i18n/hsb.json
M languages/i18n/hu.json
M languages/i18n/ia.json
M languages/i18n/ilo.json
M languages/i18n/it.json
M languages/i18n/ja.json
M languages/i18n/kab.json
M languages/i18n/kk-cyrl.json
M languages/i18n/ko.json
M languages/i18n/ksh.json
M languages/i18n/lb.json
M languages/i18n/mk.json
M languages/i18n/ml.json
M languages/i18n/ms.json
M languages/i18n/nb.json
M languages/i18n/nl.json
M languages/i18n/pl.json
M languages/i18n/pms.json
M languages/i18n/pt-br.json
M languages/i18n/pt.json
M languages/i18n/qqq.json
M languages/i18n/ro.json
M languages/i18n/ru.json
M languages/i18n/sco.json
M languages/i18n/sl.json
M languages/i18n/sr-ec.json
M languages/i18n/sr-el.json
M languages/i18n/sv.json
M languages/i18n/te.json
M languages/i18n/th.json
M languages/i18n/tl.json
M languages/i18n/tr.json
M languages/i18n/uk.json
M languages/i18n/vi.json
M languages/i18n/zh-hans.json
M languages/i18n/zh-hant.json
M maintenance/language/messages.inc
63 files changed, 55 insertions(+), 72 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index bc0b8ff..b03b552 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 );
@@ -348,12 +348,12 @@
abstract public function outputChangesList( $rows, $opts );
/**
-* Return the text to be displayed above the changes
+* Set the text to be displayed above the changes
*
* @param FormOptions $opts
-* @return string XHTML
+* @param int $numRows Number of rows in the result to show after this
header
*/
- 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 f1a31a5..5a7f698 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -350,12 +350,12 @@
}
/**
-* Return the text to be displayed above the changes
+* Set the text to be displayed above the changes
*
* @param FormOptions $opts
-* @return string XHTML
+* @param int $numRows Number of rows in the result to show after this
header
*/
- public function doHeader( $opts ) {
+ public function doHeader( $opts, $numRows ) {
global $wgScript;
$this-setTopText( $opts );
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index f7024fd..b20d857
[MediaWiki-commits] [Gerrit] Restore the number of rows shown on Special:Watchlist - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150254
Change subject: Restore the number of rows shown on Special:Watchlist
..
Restore the number of rows shown on Special:Watchlist
This reverts the result of Iada3a93762dd25fdaf35fb707304abc40bd4a5b1.
It used a param which was added to function doHeader in
I495d19258205d8713a19aa934a7657aecbe240d4.
It reused the old message to reduce translation interaction.
Bug: 62017
Change-Id: Ie722c509a6ad1346b1624abee778f4cbdc79d457
---
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/150254/1
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index b1fbdea..b2574e0 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -407,7 +407,7 @@
$wlInfo = '';
if ( $opts['days'] 0 ) {
$timestamp = wfTimestampNow();
- $wlInfo = $this-msg( 'wlnote2' )-numParams( round(
$opts['days'] * 24 ) )-params(
+ $wlInfo = $this-msg( 'wlnote' )-numParams( $numRows,
round( $opts['days'] * 24 ) )-params(
$lang-userDate( $timestamp, $user ),
$lang-userTime( $timestamp, $user )
)-parse() . br /\n;
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 78570dc..f33bf1f 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1826,7 +1826,7 @@
watchlist-details: {{PLURAL:$1|$1 page|$1 pages}} on your watchlist,
not separately counting talk pages.,
wlheader-enotif: Email notification is enabled.,
wlheader-showupdated: Pages that have been changed since you last
visited them are shown in strongbold/strong.,
- wlnote2: Below are the changes in the last
{{PLURAL:$1|hour|strong$1/strong hours}}, as of $2, $3.,
+ wlnote: Below {{PLURAL:$1|is the last change|are the last
strong$1/strong changes}} in the last {{PLURAL:$2|hour|strong$2/strong
hours}}, as of $3, $4.,
wlshowlast: Show last $1 hours $2 days $3,
watchlist-options: Watchlist options,
watching: Watching...,
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index a95fb72..698f246 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1988,7 +1988,7 @@
watchlist-details: Message on [[Special:Watchlist]]. Parameters:\n*
$1 - number of pages in your watchlist\nThis is paired with the message
{{msg-mw|Nowatchlist}} which appears instead of Watchlist-details when $1 is
0.\nSee also:\n* {{msg-mw|Watchlist-options|fieldset}}\n*
{{msg-mw|Wlheader-enotif|watchlist header}}\n* {{msg-mw|enotif reset|Submit
button text}}\n* {{msg-mw|Watchlistcontains}},
wlheader-enotif: Message at the top of [[Special:Watchlist]], after
{{msg-mw|watchlist-details}}. Has to be a full sentence.\n\nSee also:\n*
{{msg-mw|Watchlist-options|fieldset}}\n* {{msg-mw|enotif reset|Submit button
text}},
wlheader-showupdated: Message at the top of [[Special:Watchlist]],
after {{msg-mw|watchlist-details}}. Has to be a full sentence.,
- wlnote2: Used on [[Special:Watchlist]] when a maximum number of
hours or days is specified.\n\nParameters:\n* $1 - the number of hours for
which the changes are shown\n* $2 - a date alone\n* $3 - a time alone\nSee
also:\n* {{msg-mw|Wlnote}},
+ wlnote: Used on [[Special:Watchlist]] when a maximum number of hours
or days is specified.\n\nParameters:\n* $1 - the number of changes shown\n* $2
- the number of hours for which the changes are shown\n* $3 - a date alone\n*
$4 - a time alone,
wlshowlast: Appears on [[Special:Watchlist]]. Parameters:\n* $1 - a
choice of different numbers of hours (\1 | 2 | 6 | 12\)\n* $2 - a choice of
different numbers of days (\1 | 3 | 7\)\n* $3 -
{{msg-mw|watchlistall2}}\nClicking on your choice changes the list of changes
you see (without changing the default in my preferences).,
watchlist-options: Legend of the fieldset of
[[Special:Watchlist]]\n\nSee also:\n* {{msg-mw|Watchlist-details|watchlist
header}}\n* {{msg-mw|Wlheader-enotif|watchlist header}}\n* {{msg-mw|enotif
reset|Submit button text}},
watching: Text displayed when clicked on the watch tab:
{{msg-mw|Watch}}. It means the wiki is adding that page to your watchlist.,
--
To view, visit https://gerrit.wikimedia.org/r/150254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie722c509a6ad1346b1624abee778f4cbdc79d457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
[MediaWiki-commits] [Gerrit] Restore the number of rows shown on Special:Watchlist - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Restore the number of rows shown on Special:Watchlist
..
Restore the number of rows shown on Special:Watchlist
This reverts the result of Iada3a93762dd25fdaf35fb707304abc40bd4a5b1.
It used a param which was added to function doHeader in
I495d19258205d8713a19aa934a7657aecbe240d4.
It reused the old message to reduce translation interaction.
Bug: 62017
Change-Id: Ie722c509a6ad1346b1624abee778f4cbdc79d457
---
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index b1fbdea..b2574e0 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -407,7 +407,7 @@
$wlInfo = '';
if ( $opts['days'] 0 ) {
$timestamp = wfTimestampNow();
- $wlInfo = $this-msg( 'wlnote2' )-numParams( round(
$opts['days'] * 24 ) )-params(
+ $wlInfo = $this-msg( 'wlnote' )-numParams( $numRows,
round( $opts['days'] * 24 ) )-params(
$lang-userDate( $timestamp, $user ),
$lang-userTime( $timestamp, $user )
)-parse() . br /\n;
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 78570dc..f33bf1f 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1826,7 +1826,7 @@
watchlist-details: {{PLURAL:$1|$1 page|$1 pages}} on your watchlist,
not separately counting talk pages.,
wlheader-enotif: Email notification is enabled.,
wlheader-showupdated: Pages that have been changed since you last
visited them are shown in strongbold/strong.,
- wlnote2: Below are the changes in the last
{{PLURAL:$1|hour|strong$1/strong hours}}, as of $2, $3.,
+ wlnote: Below {{PLURAL:$1|is the last change|are the last
strong$1/strong changes}} in the last {{PLURAL:$2|hour|strong$2/strong
hours}}, as of $3, $4.,
wlshowlast: Show last $1 hours $2 days $3,
watchlist-options: Watchlist options,
watching: Watching...,
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index a95fb72..698f246 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1988,7 +1988,7 @@
watchlist-details: Message on [[Special:Watchlist]]. Parameters:\n*
$1 - number of pages in your watchlist\nThis is paired with the message
{{msg-mw|Nowatchlist}} which appears instead of Watchlist-details when $1 is
0.\nSee also:\n* {{msg-mw|Watchlist-options|fieldset}}\n*
{{msg-mw|Wlheader-enotif|watchlist header}}\n* {{msg-mw|enotif reset|Submit
button text}}\n* {{msg-mw|Watchlistcontains}},
wlheader-enotif: Message at the top of [[Special:Watchlist]], after
{{msg-mw|watchlist-details}}. Has to be a full sentence.\n\nSee also:\n*
{{msg-mw|Watchlist-options|fieldset}}\n* {{msg-mw|enotif reset|Submit button
text}},
wlheader-showupdated: Message at the top of [[Special:Watchlist]],
after {{msg-mw|watchlist-details}}. Has to be a full sentence.,
- wlnote2: Used on [[Special:Watchlist]] when a maximum number of
hours or days is specified.\n\nParameters:\n* $1 - the number of hours for
which the changes are shown\n* $2 - a date alone\n* $3 - a time alone\nSee
also:\n* {{msg-mw|Wlnote}},
+ wlnote: Used on [[Special:Watchlist]] when a maximum number of hours
or days is specified.\n\nParameters:\n* $1 - the number of changes shown\n* $2
- the number of hours for which the changes are shown\n* $3 - a date alone\n*
$4 - a time alone,
wlshowlast: Appears on [[Special:Watchlist]]. Parameters:\n* $1 - a
choice of different numbers of hours (\1 | 2 | 6 | 12\)\n* $2 - a choice of
different numbers of days (\1 | 3 | 7\)\n* $3 -
{{msg-mw|watchlistall2}}\nClicking on your choice changes the list of changes
you see (without changing the default in my preferences).,
watchlist-options: Legend of the fieldset of
[[Special:Watchlist]]\n\nSee also:\n* {{msg-mw|Watchlist-details|watchlist
header}}\n* {{msg-mw|Wlheader-enotif|watchlist header}}\n* {{msg-mw|enotif
reset|Submit button text}},
watching: Text displayed when clicked on the watch tab:
{{msg-mw|Watch}}. It means the wiki is adding that page to your watchlist.,
--
To view, visit https://gerrit.wikimedia.org/r/150254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie722c509a6ad1346b1624abee778f4cbdc79d457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
[MediaWiki-commits] [Gerrit] Restore the number of rows shown on Special:Watchlist - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150390
Change subject: Restore the number of rows shown on Special:Watchlist
..
Restore the number of rows shown on Special:Watchlist
This reverts the result of Iada3a93762dd25fdaf35fb707304abc40bd4a5b1.
This is a manual cherry pick of
Ie722c509a6ad1346b1624abee778f4cbdc79d457,
Ibb23838843a9a1cb8bb23347c3b2de7437861ae0 and necessary parts of
I495d19258205d8713a19aa934a7657aecbe240d4.
Contains only translations of message wlnote which was exported today
with Id59d00bd9402da7fd03a34bd6d0ceb9bd2d00024.
Bug: 62017
Change-Id: I5549e25f22f96eb69059b4d298bc50d11c72f1f1
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
M languages/i18n/ar.json
M languages/i18n/ast.json
M languages/i18n/be-tarask.json
M languages/i18n/bn.json
M languages/i18n/ca.json
M languages/i18n/ce.json
M languages/i18n/cs.json
M languages/i18n/cy.json
M languages/i18n/da.json
M languages/i18n/de.json
M languages/i18n/diq.json
M languages/i18n/dsb.json
M languages/i18n/en.json
M languages/i18n/eo.json
M languages/i18n/es.json
M languages/i18n/et.json
M languages/i18n/fa.json
M languages/i18n/fi.json
M languages/i18n/fr.json
M languages/i18n/frr.json
M languages/i18n/gl.json
M languages/i18n/he.json
M languages/i18n/hi.json
M languages/i18n/hsb.json
M languages/i18n/hu.json
M languages/i18n/ia.json
M languages/i18n/ilo.json
M languages/i18n/it.json
M languages/i18n/ja.json
M languages/i18n/kab.json
M languages/i18n/kk-cyrl.json
M languages/i18n/ko.json
M languages/i18n/ksh.json
M languages/i18n/lb.json
M languages/i18n/mk.json
M languages/i18n/ml.json
M languages/i18n/ms.json
M languages/i18n/nb.json
M languages/i18n/nl.json
M languages/i18n/pl.json
M languages/i18n/pms.json
M languages/i18n/pt-br.json
M languages/i18n/pt.json
M languages/i18n/qqq.json
M languages/i18n/ro.json
M languages/i18n/ru.json
M languages/i18n/sco.json
M languages/i18n/sl.json
M languages/i18n/sr-ec.json
M languages/i18n/sr-el.json
M languages/i18n/sv.json
M languages/i18n/te.json
M languages/i18n/th.json
M languages/i18n/tl.json
M languages/i18n/tr.json
M languages/i18n/uk.json
M languages/i18n/vi.json
M languages/i18n/zh-hans.json
M languages/i18n/zh-hant.json
M maintenance/language/messages.inc
63 files changed, 55 insertions(+), 72 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/150390/1
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index bc0b8ff..b03b552 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 );
@@ -348,12 +348,12 @@
abstract public function outputChangesList( $rows, $opts );
/**
-* Return the text to be displayed above the changes
+* Set the text to be displayed above the changes
*
* @param FormOptions $opts
-* @return string XHTML
+* @param int $numRows Number of rows in the result to show after this
header
*/
- 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 f1a31a5..5a7f698 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -350,12 +350,12 @@
}
/**
-* Return the text to be displayed above the changes
+* Set the text to be displayed above the changes
*
* @param FormOptions $opts
-* @return string XHTML
+* @param int $numRows Number of rows in the result to show after this
header
*/
- public function doHeader( $opts ) {
+ public function doHeader( $opts, $numRows ) {
global $wgScript;
$this-setTopText( $opts );
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index f7024fd..b20d857 100644
---
