r48057 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r48056‎ | r48057 | r48058 >
Date:09:02, 5 March 2009
Author:siebrand
Status:ok
Tags:
Comment:
Use date and time separately in UI sentence 'centralauth-admin-blocked'
Modified paths:
  • /trunk/extensions/CentralAuth/CentralAuth.i18n.php (modified) (history)
  • /trunk/extensions/CentralAuth/SpecialCentralAuth.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CentralAuth/SpecialCentralAuth.php
@@ -342,9 +342,11 @@
343343 if ($row['blocked']) {
344344 global $wgLang;
345345 $expiry = $wgLang->timeanddate( $row['block-expiry'] );
 346+ $expiryd = $wgLang->date( $row['block-expiry'] );
 347+ $expiryt = $wgLang->time( $row['block-expiry'] );
346348 $reason = $row['block-reason'];
347349
348 - return wfMsgExt( 'centralauth-admin-blocked', 'parseinline', array( $expiry, $reason ) );
 350+ return wfMsgExt( 'centralauth-admin-blocked', 'parseinline', array( $expiry, $reason, $expiryd, $expiryt ) );
349351 } else {
350352 return wfMsgExt( 'centralauth-admin-notblocked', 'parseinline' );
351353 }
Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php
@@ -140,7 +140,7 @@
141141 'centralauth-admin-unattached' => 'Unattached accounts',
142142 'centralauth-admin-no-unattached' => 'No unmerged accounts remain.',
143143 'centralauth-admin-notblocked' => 'Not blocked',
144 - 'centralauth-admin-blocked' => 'Blocked with expiry $1. Reason: $2',
 144+ 'centralauth-admin-blocked' => 'Blocked with expiry on $3 at $4. Reason: $2',
145145 'centralauth-admin-list-localwiki' => 'Local wiki',
146146 'centralauth-admin-list-attached-on' => 'Attached on',
147147 'centralauth-admin-list-method' => 'Method',

Follow-up revisions

RevisionCommit summaryAuthorDate
r48853Fix blocked status display, was broken for indef blocks since r48057.werdna03:27, 26 March 2009

Status & tagging log