r49077 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r49076‎ | r49077 | r49078 >
Date:14:55, 31 March 2009
Author:purodha
Status:deferred
Tags:
Comment:
(Bug 18282) additional parameters $2, $3 = date, time to MediaWiki:regexblock-view-time.
Modified paths:
  • /trunk/extensions/regexBlock/SpecialRegexBlock.php (modified) (history)
  • /trunk/extensions/regexBlock/regexBlock.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/regexBlock/regexBlock.i18n.php
@@ -102,6 +102,7 @@
103103 'regexblock-view-go' => '{{Identical|Go}}',
104104 'regexblock-view-match' => '{{Identical|Exact match}}',
105105 'regexblock-view-block-temporary' => '{{Identical|Expires on}}',
 106+ 'regexblock-view-time' => 'parameters: $1 is a date/time, $2 is its date alone, $3 is its time isolated.',
106107 'right-regexblock' => '{{doc-right}}',
107108 );
108109
Index: trunk/extensions/regexBlock/SpecialRegexBlock.php
@@ -270,7 +270,8 @@
271271
272272 $wgOut->addHTML('<li style="border-bottom:1px dashed #778899; padding-bottom:2px;font-size:11px">
273273 <b><font style="color:#3B7F07; font-size:12px">'.$row['blckby_name'].'</font>'.$comma.$exact_match.$create_block.'</b>'.$comma.'
274 - ('.wfMsg( 'regexblock-view-block-by' ).' <b>'.$row['blocker'].'</b>, '.$reason.') '.wfMsg( 'regexblock-view-time', $row['time'] ).$comma.'
 274+ ('.wfMsg( 'regexblock-view-block-by' ).' <b>'.$row['blocker'].'</b>, '.$reason.') '.
 275+ wfMsg( 'regexblock-view-time', $row['datim'], $row['date'], $row['time'] ).$comma.'
275276 (<a href="'.$action_unblock.'&ip='.$row['ublock_ip'].'&blocker='.$row['ublock_blocker'].'">'.wfMsg( 'regexblock-view-block-unblock' ).'</a>) '.$comma.$row['expiry'].$comma.' ('.$stats_link.')
276277 </li>');
277278 }
@@ -525,7 +526,9 @@
526527 $ublock_ip = urlencode( $row->blckby_name );
527528 $ublock_blocker = urlencode( $row->blckby_blocker );
528529 $reason = ( $row->blckby_reason ) ? wfMsg( 'regexblock-form-reason' ) . $row->blckby_reason : wfMsg( 'regexblock-view-reason-default' );
529 - $time = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->blckby_timestamp ), true );
 530+ $idatim = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->blckby_timestamp ), true );
 531+ $date = $wgLang->date( wfTimestamp( TS_MW, $row->blckby_timestamp ), true );
 532+ $time = $wgLang->time( wfTimestamp( TS_MW, $row->blckby_timestamp ), true );
530533
531534 /* put data to array */
532535 $blocker_list[] = array(
@@ -534,6 +537,8 @@
535538 'create_block' => $row->blckby_create,
536539 'blocker' => $row->blckby_blocker,
537540 'reason' => $reason,
 541+ 'datim' => $datim,
 542+ 'date' => $date,
538543 'time' => $time,
539544 'ublock_ip' => $ublock_ip,
540545 'ublock_blocker' => $ublock_blocker,

Status & tagging log