From eb935e81c858337c1dc6ed5c6609111208a443e7 Mon Sep 17 00:00:00 2001 From: Rob Church Date: Mon, 1 May 2006 00:12:07 +0000 Subject: [PATCH] (bug 5696) Add a third parameter, $3, to "rcnote", passing the current time formatted according to the current user's settings --- RELEASE-NOTES | 2 ++ includes/SpecialRecentchanges.php | 2 +- includes/SpecialRecentchangeslinked.php | 4 ++-- includes/SpecialWatchlist.php | 2 +- languages/Messages.php | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 30b0f6d463..3ddc2e2eff 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -174,6 +174,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN user rights * (bug 137) Commented out translations for copyrightwarning which mention GNU FDL * (bug 5723) Don't count pages linked to from the MediaWiki namespace as "wanted" +* (bug 5696) Add a third parameter, $3, to "rcnote", passing the current time + formatted according to the current user's settings == Compatibility == diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php index 70ad0bc922..a3332e8f8f 100644 --- a/includes/SpecialRecentchanges.php +++ b/includes/SpecialRecentchanges.php @@ -499,7 +499,7 @@ function rcOptionsPanel( $defaults, $nondefaults ) { if( $options['from'] ) $note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $options['limit'] ), $wgLang->timeanddate( $options['from'], true ) ); else - $note = wfMsg( 'rcnote', $wgLang->formatNum( $options['limit'] ), $wgLang->formatNum( $options['days'] ) ); + $note = wfMsg( 'rcnote', $wgLang->formatNum( $options['limit'] ), $wgLang->formatNum( $options['days'] ), $wgLang->timeAndDate( wfTimestampNow(), true ) ); // limit links $cl = ''; diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php index c543f89faf..79654b58e7 100644 --- a/includes/SpecialRecentchangeslinked.php +++ b/includes/SpecialRecentchangeslinked.php @@ -15,7 +15,7 @@ require_once( 'SpecialRecentchanges.php' ); * @param string $par parent page we will look at */ function wfSpecialRecentchangeslinked( $par = NULL ) { - global $wgUser, $wgOut, $wgContLang, $wgRequest; + global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest; $fname = 'wfSpecialRecentchangeslinked'; $days = $wgRequest->getInt( 'days' ); @@ -131,7 +131,7 @@ ORDER BY rc_timestamp DESC $res = $dbr->query( $sql, $fname ); $wgOut->addHTML("< ".$sk->makeKnownLinkObj($nt, "", "redirect=no" )."
\n"); - $note = wfMsg( "rcnote", $limit, $days ); + $note = wfMsg( "rcnote", $limit, $days, $wgLang->timeAndDate( wfTimestampNow(), true ) ); $wgOut->addHTML( "
\n{$note}\n
" ); $note = rcDayLimitlinks( $days, $limit, "Recentchangeslinked", diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php index 4f37fc0dc8..a80c11f529 100644 --- a/includes/SpecialWatchlist.php +++ b/includes/SpecialWatchlist.php @@ -315,7 +315,7 @@ function wfSpecialWatchlist( $par ) { if($days >= 1) $wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ), - $wgLang->formatNum( $days ) ) . '
' , false ); + $wgLang->formatNum( $days ), $wgLang->timeAndDate( wfTimestampNow(), true ) ) . '
' , false ); elseif($days > 0) $wgOut->addWikiText( wfMsg( 'wlnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( round($days*24) ) ) . '
' , false ); diff --git a/languages/Messages.php b/languages/Messages.php index 8045c07342..9a0bfe8296 100644 --- a/languages/Messages.php +++ b/languages/Messages.php @@ -789,7 +789,7 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left 'recentchanges' => 'Recent changes', 'recentchanges-url' => 'Special:Recentchanges', 'recentchangestext' => 'Track the most recent changes to the wiki on this page.', -'rcnote' => "Below are the last $1 changes in last $2 days.", +'rcnote' => "Below are the last $1 changes in the last $2 days, as of $3.", 'rcnotefrom' => "Below are the changes since $2 (up to $1 shown).", 'rclistfrom' => "Show new changes starting from $1", 'rcshowhideminor' => '$1 minor edits', -- 2.20.1