From 8bb38fb64c01980e3b8cf1069d1d49e6acbd3b27 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Tue, 29 Jul 2014 19:02:16 +0200 Subject: [PATCH] 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 --- includes/specials/SpecialWatchlist.php | 2 +- languages/i18n/en.json | 2 +- languages/i18n/qqq.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index b1fbdea98e..b2574e06c5 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -407,7 +407,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { $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() . "
\n"; } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 78570dcda5..f33bf1feeb 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 bold.", - "wlnote2": "Below are the changes in the last {{PLURAL:$1|hour|$1 hours}}, as of $2, $3.", + "wlnote": "Below {{PLURAL:$1|is the last change|are the last $1 changes}} in the last {{PLURAL:$2|hour|$2 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 a95fb72e4e..698f246fc7 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.", -- 2.20.1