From: tonythomas01 <01tonythomas@gmail.com> Date: Tue, 14 Jan 2014 13:33:17 +0000 (+0530) Subject: Split date and time in message 'rclistfrom' X-Git-Tag: 1.31.0-rc.0~16753^2 X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=6ba458a220e06c65aa94737992da137a37a698db;p=lhc%2Fweb%2Fwiklou.git Split date and time in message 'rclistfrom' Some languages need a split of date and time to make better translation. Added a new parameters for 'rclistfrom', converted the whole message to a link, updated Qqq entries. Bug: 19104 Change-Id: Id9127cf022be2394b2a4843572088e0ba8a888a8 --- diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index f5a5206bcf..a5710a96c9 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -753,13 +753,15 @@ class SpecialRecentChanges extends ChangesListSpecialPage { // show from this onward link $timestamp = wfTimestampNow(); $now = $lang->userTimeAndDate( $timestamp, $user ); - $tl = $this->makeOptionsLink( - $now, array( 'from' => $timestamp ), $nondefaults - ); - + $timenow = $lang->userTime( $timestamp, $user ); + $datenow = $lang->userDate( $timestamp, $user ); $rclinks = $this->msg( 'rclinks' )->rawParams( $cl, $dl, $lang->pipeList( $links ) ) ->parse(); - $rclistfrom = $this->msg( 'rclistfrom' )->rawParams( $tl )->parse(); + $rclistfrom = $this->makeOptionsLink( + $this->msg( 'rclistfrom' )->rawParams( $now, $timenow, $datenow )->parse(), + array( 'from' => $timestamp ), + $nondefaults + ); return "{$note}$rclinks
$rclistfrom"; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 7a4b400785..b3fa47b941 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2207,7 +2207,7 @@ Your email address is not revealed when other users contact you.', 'recentchanges-legend-newpage' => '(also see [[Special:NewPages|list of new pages]])', 'recentchanges-legend-plusminus' => '(±123)', # only translate this message to other languages if you have to change it 'rcnotefrom' => 'Below are the changes since $2 (up to $1 shown).', -'rclistfrom' => 'Show new changes starting from $1', +'rclistfrom' => 'Show new changes starting from $2, $3', 'rcshowhideminor' => '$1 minor edits', 'rcshowhideminor-show' => 'Show', 'rcshowhideminor-hide' => 'Hide', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index fc8ecf7ee6..45b0e2ea76 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -3682,7 +3682,7 @@ Preceded by legend example {{msg-mw|Recentchanges-legend-plusminus}}.', A plus/minus sign with a number for the legend.', 'rcnotefrom' => 'This message is displayed at [[Special:RecentChanges]] when viewing recentchanges from some specific time. -The corresponding message is {{msg-mw|Rclistfrom}} (without split of date and time, [[bugzilla:19104|Bug 19104]]). +The corresponding message is {{msg-mw|Rclistfrom}} (split into date and time). Parameters: * $1 - the maximum number of changes that are displayed @@ -3692,7 +3692,9 @@ Parameters: 'rclistfrom' => 'Used on [[Special:RecentChanges]]. Parameters: -* $1 - a link to the revision of a specific date and time. The date and the time are the link description (without split of date and time, [[bugzilla:19104|Bug 19104]]). +* $1 - Revision of a specific date and time. The date and the time adds to the rclistfrom description. No longer used. +* $2 - Revision of a specific time. The time adds to the rclistfrom link description (with split of date and time). +* $3 - Revision of a specific date. The date adds to the rclistfrom link description (with split of date and time). The corresponding message is {{msg-mw|Rcnotefrom}}.', 'rcshowhideminor' => 'Option text in [[Special:RecentChanges]]. Parameters: