Index: trunk/phase3/RELEASE-NOTES-1.19 |
— | — | @@ -127,6 +127,7 @@ |
128 | 128 | * (bug 32022) Our phpunit.php script can now be executed from another directory |
129 | 129 | * (bug 26020) Setting $wgEmailConfirmToEdit to true no longer removes diffs |
130 | 130 | from recent changes feeds |
| 131 | +* (bug 30232) add current time to message wlnote on Special:Watchlist |
131 | 132 | |
132 | 133 | === API changes in 1.19 === |
133 | 134 | * (bug 19838) siprop=interwikimap can now use the interwiki cache. |
Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
— | — | @@ -298,20 +298,14 @@ |
299 | 299 | /* Start bottom header */ |
300 | 300 | |
301 | 301 | $wlInfo = ''; |
302 | | - if( $values['days'] >= 1 ) { |
| 302 | + if( $values['days'] > 0 ) { |
303 | 303 | $timestamp = wfTimestampNow(); |
304 | | - $wlInfo = wfMsgExt( 'rcnote', 'parseinline', |
| 304 | + $wlInfo = wfMsgExt( 'wlnote', 'parseinline', |
305 | 305 | $lang->formatNum( $numRows ), |
306 | | - $lang->formatNum( $values['days'] ), |
307 | | - $lang->timeAndDate( $timestamp, true ), |
| 306 | + $lang->formatNum( round( $values['days'] * 24 ) ), |
308 | 307 | $lang->date( $timestamp, true ), |
309 | 308 | $lang->time( $timestamp, true ) |
310 | 309 | ) . '<br />'; |
311 | | - } elseif( $values['days'] > 0 ) { |
312 | | - $wlInfo = wfMsgExt( 'wlnote', 'parseinline', |
313 | | - $lang->formatNum( $numRows ), |
314 | | - $lang->formatNum( round( $values['days'] * 24 ) ) |
315 | | - ) . '<br />'; |
316 | 310 | } |
317 | 311 | |
318 | 312 | $cutofflinks = "\n" . $this->cutoffLinks( $values['days'], $nondefaults ) . "<br />\n"; |
Index: trunk/phase3/languages/messages/MessagesQqq.php |
— | — | @@ -1713,6 +1713,7 @@ |
1714 | 1714 | 'recentchanges-label-bot' => 'Tooltip for {{msg-mw|boteditletter}}', |
1715 | 1715 | 'recentchanges-label-unpatrolled' => 'Tooltip for {{msg-mw|unpatrolledletter}}', |
1716 | 1716 | 'rcnote' => 'Used on [[Special:RecentChanges]]. |
| 1717 | +Shoulds looks like the message wlnote used similary but on Special:Recentchanges |
1717 | 1718 | * $1 is the number of changes shown, |
1718 | 1719 | * $2 is the number of days for which the changes are shown, |
1719 | 1720 | * $3 is a date and time (deprecated), |
— | — | @@ -2411,6 +2412,13 @@ |
2412 | 2413 | 'nowatchlist' => 'Displayed when there is no pages in the watchlist.', |
2413 | 2414 | 'watchlistanontext' => '* $1 is a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description', |
2414 | 2415 | 'watchnologin' => '{{Identical|Not logged in}}', |
| 2416 | +'wlnote' => 'Used on Special:WatchList when days > 0 |
| 2417 | +Shoulds looks like the message rcnote used similary but on Special:Recentchanges |
| 2418 | +* $1 is the number of changes shown, |
| 2419 | +* $2 is the number of days for which the changes are shown, |
| 2420 | +* $3 is a date alone, |
| 2421 | +* $4 is a time alone. |
| 2422 | +', |
2415 | 2423 | 'addwatch' => 'Link to a dialog box, displayed at the end of the list of categories at the foot of each page.', |
2416 | 2424 | 'addedwatchtext' => 'Explanation shown when clicking on the {{msg|watch}} tab. See also {{msg|addedwatch}}.', |
2417 | 2425 | 'removedwatchtext' => "After a page has been removed from a user's watchlist by clicking the {{msg|unwatch}} tab at the top of an article, this message appears just below the title of the article. $1 is the title of the article. See also {{msg|removedwatch}} and {{msg|addedwatchtext}}.", |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -2731,7 +2731,7 @@ |
2732 | 2732 | 'watchmethod-list' => 'checking watched pages for recent edits', |
2733 | 2733 | 'watchlistcontains' => 'Your watchlist contains $1 {{PLURAL:$1|page|pages}}.', |
2734 | 2734 | 'iteminvalidname' => "Problem with item '$1', invalid name...", |
2735 | | -'wlnote' => "Below {{PLURAL:$1|is the last change|are the last '''$1''' changes}} in the last {{PLURAL:$2|hour|'''$2''' hours}}.", |
| 2735 | +'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.", |
2736 | 2736 | 'wlshowlast' => 'Show last $1 hours $2 days $3', |
2737 | 2737 | 'watchlist-options' => 'Watchlist options', |
2738 | 2738 | |