| Index: trunk/extensions/CentralAuth/SpecialCentralAuth.php |
| — | — | @@ -340,13 +340,18 @@ |
| 341 | 341 | |
| 342 | 342 | function showBlockStatus( $row ) { |
| 343 | 343 | if ($row['blocked']) { |
| 344 | | - global $wgLang; |
| 345 | | - $expiry = $wgLang->timeanddate( $row['block-expiry'] ); |
| 346 | | - $expiryd = $wgLang->date( $row['block-expiry'] ); |
| 347 | | - $expiryt = $wgLang->time( $row['block-expiry'] ); |
| | 344 | + if ($row['block-expiry'] == 'infinity') { |
| 348 | 345 | $reason = $row['block-reason']; |
| 349 | | - |
| 350 | | - return wfMsgExt( 'centralauth-admin-blocked', 'parseinline', array( $expiry, $reason, $expiryd, $expiryt ) ); |
| | 346 | + return wfMsgExt( 'centralauth-admin-blocked-indef', 'parseinline', array( $reason ) ); |
| | 347 | + } else { |
| | 348 | + global $wgLang; |
| | 349 | + $expiry = $wgLang->timeanddate( $row['block-expiry'] ); |
| | 350 | + $expiryd = $wgLang->date( $row['block-expiry'] ); |
| | 351 | + $expiryt = $wgLang->time( $row['block-expiry'] ); |
| | 352 | + $reason = $row['block-reason']; |
| | 353 | + |
| | 354 | + return wfMsgExt( 'centralauth-admin-blocked', 'parseinline', array( $expiry, $reason, $expiryd, $expiryt ) ); |
| | 355 | + } |
| 351 | 356 | } else { |
| 352 | 357 | return wfMsgExt( 'centralauth-admin-notblocked', 'parseinline' ); |
| 353 | 358 | } |
| Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -140,7 +140,8 @@ |
| 141 | 141 | 'centralauth-admin-unattached' => 'Unattached accounts', |
| 142 | 142 | 'centralauth-admin-no-unattached' => 'No unmerged accounts remain.', |
| 143 | 143 | 'centralauth-admin-notblocked' => 'Not blocked', |
| 144 | | - 'centralauth-admin-blocked' => 'Blocked with expiry on $3 at $4. Reason: $2', |
| | 144 | + 'centralauth-admin-blocked' => 'Blocked, expires $3 at $4. Reason: $2', |
| | 145 | + 'centralauth-admin-blocked-indef' => 'Blocked indefinitely. Reason: $1', |
| 145 | 146 | 'centralauth-admin-list-localwiki' => 'Local wiki', |
| 146 | 147 | 'centralauth-admin-list-attached-on' => 'Attached on', |
| 147 | 148 | 'centralauth-admin-list-method' => 'Method', |