Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
— | — | @@ -599,7 +599,9 @@ |
600 | 600 | $note = wfMsgExt( 'rcnote', array( 'parseinline' ), |
601 | 601 | $wgLang->formatNum( $options['limit'] ), |
602 | 602 | $wgLang->formatNum( $options['days'] ), |
603 | | - $wgLang->timeAndDate( wfTimestampNow(), true ) ); |
| 603 | + $wgLang->timeAndDate( wfTimestampNow(), true ), |
| 604 | + $wgLang->date( wfTimestampNow(), true ), |
| 605 | + $wgLang->time( wfTimestampNow(), true ) ); |
604 | 606 | |
605 | 607 | # Sort data for display and make sure it's unique after we've added user data. |
606 | 608 | $wgRCLinkLimits[] = $options['limit']; |
Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
— | — | @@ -206,11 +206,22 @@ |
207 | 207 | $wgOut->addHTML( "<hr />\n" ); |
208 | 208 | |
209 | 209 | if($days >= 1) { |
210 | | - $wgOut->addWikiText( wfMsgExt( 'rcnote', array( 'parseinline' ), $wgLang->formatNum( $numRows ), |
211 | | - $wgLang->formatNum( $days ), $wgLang->timeAndDate( wfTimestampNow(), true ) ) . '<br />' , false ); |
| 210 | + $wgOut->addHTML( |
| 211 | + wfMsgExt( 'rcnote', 'parseinline', |
| 212 | + $wgLang->formatNum( $numRows ), |
| 213 | + $wgLang->formatNum( $days ), |
| 214 | + $wgLang->timeAndDate( wfTimestampNow(), true ), |
| 215 | + $wgLang->date( wfTimestampNow(), true ), |
| 216 | + $wgLang->time( wfTimestampNow(), true ) |
| 217 | + ) . '<br />' |
| 218 | + ); |
212 | 219 | } elseif($days > 0) { |
213 | | - $wgOut->addWikiText( wfMsgExt( 'wlnote', array( 'parseinline' ), $wgLang->formatNum( $numRows ), |
214 | | - $wgLang->formatNum( round($days*24) ) ) . '<br />' , false ); |
| 220 | + $wgOut->addHtml( |
| 221 | + wfMsgExt( 'wlnote', 'parseinline', |
| 222 | + $wgLang->formatNum( $numRows ), |
| 223 | + $wgLang->formatNum( round($days*24) ) |
| 224 | + ) . '<br />' |
| 225 | + ); |
215 | 226 | } |
216 | 227 | |
217 | 228 | $wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" ); |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -1560,7 +1560,7 @@ |
1561 | 1561 | 'recentchanges-url' => 'Special:Recentchanges', # do not translate or duplicate this message to other languages |
1562 | 1562 | 'recentchangestext' => 'Track the most recent changes to the wiki on this page.', |
1563 | 1563 | 'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.', |
1564 | | -'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $3.", |
| 1564 | +'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $5, $4.", |
1565 | 1565 | 'rcnotefrom' => "Below are the changes since '''$2''' (up to '''$1''' shown).", |
1566 | 1566 | 'rclistfrom' => 'Show new changes starting from $1', |
1567 | 1567 | 'rcshowhideminor' => '$1 minor edits', |