| Index: trunk/phase3/includes/specials/SpecialListUserRestrictions.php |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | $subjlink = $sk->userLink( $r->getSubjectId(), $r->getSubjectText() ) . |
| 136 | 136 | $sk->userToolLinks( $r->getSubjectId(), $r->getSubjectText() ); |
| 137 | 137 | $expiry = is_numeric( $r->getExpiry() ) ? |
| 138 | | - wfMsg( 'listuserrestrictions-row-expiry', $wgLang->timeanddate( $r->getExpiry() ) ) : |
| | 138 | + wfMsg( 'listuserrestrictions-row-expiry', $wgLang->date( $r->getExpiry() ), $wgLang->time( $r->getExpiry() ) ) : |
| 139 | 139 | wfMsg( 'ipbinfinite' ); |
| 140 | 140 | $msg = ''; |
| 141 | 141 | if( $r->isNamespace() ) { |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1327,17 +1327,22 @@ |
| 1328 | 1328 | if( !$r ) |
| 1329 | 1329 | $r = $user->getRestrictionForNamespace( $this->getNamespace() ); |
| 1330 | 1330 | if( $r ) { |
| 1331 | | - $start = $wgLang->timeanddate( $r->getTimestamp() ); |
| 1332 | | - $end = $r->getExpiry() == 'infinity' ? |
| 1333 | | - wfMsg( 'ipbinfinite' ) : |
| 1334 | | - $wgLang->timeanddate( $r->getExpiry() ); |
| | 1331 | + $error = array(); |
| | 1332 | + $start = array( $wgLang->date( $r->getTimestamp() ), $wgLang->time( $r->getTimestamp() ) ); |
| 1335 | 1333 | if( $r->isPage() ) |
| 1336 | | - $errors[] = array( 'userrestricted-page', $this->getFullText(), |
| 1337 | | - $r->getBlockerText(), $r->getReason(), $start, $end ); |
| 1338 | | - elseif( $r->isNamespace() ) { |
| 1339 | | - $errors[] = array( 'userrestricted-namespace', $wgLang->getDisplayNsText( $this->getNamespace() ), |
| 1340 | | - $r->getBlockerText(), $r->getReason(), $start, $end ); |
| | 1334 | + $error = array( 'userrestricted-page', $this->getFullText(), |
| | 1335 | + $r->getBlockerText(), $r->getReason(), $start[0], $start[1] ); |
| | 1336 | + elseif( $r->isNamespace() ) |
| | 1337 | + $error = array( 'userrestricted-namespace', $wgLang->getDisplayNsText( $this->getNamespace() ), |
| | 1338 | + $r->getBlockerText(), $r->getReason(), $start[0], $start[1] ); |
| | 1339 | + |
| | 1340 | + if( $r->getExpiry() == 'infinity' ) { |
| | 1341 | + $error[0] .= '-indef'; |
| | 1342 | + } else { |
| | 1343 | + $error[] = $wgLang->date( $r->getExpiry() ); |
| | 1344 | + $error[] = $wgLang->time( $r->getExpiry() ); |
| 1341 | 1345 | } |
| | 1346 | + $errors[] = $error; |
| 1342 | 1347 | } |
| 1343 | 1348 | } |
| 1344 | 1349 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1205,7 +1205,7 @@ |
| 1206 | 1206 | The restriction was put by [[User:$2|$2]]. |
| 1207 | 1207 | The reason given is \'\'$3\'\'. |
| 1208 | 1208 | |
| 1209 | | -Restriction was put at $4 and expires at $5. |
| | 1209 | +Restriction was put on $4 at $5 and expires on $6 at $7. |
| 1210 | 1210 | |
| 1211 | 1211 | You can contact [[User:$2|$2]] or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the restriction.', |
| 1212 | 1212 | 'userrestricted-namespace' => "<big>'''Your user name or IP address has been restricted from editing $1 namespace.'''</big> |
| — | — | @@ -1213,10 +1213,26 @@ |
| 1214 | 1214 | The restriction was put by [[User:$2|$2]]. |
| 1215 | 1215 | The reason given is ''$3''. |
| 1216 | 1216 | |
| 1217 | | -Restriction was put at $4 and expires at $5. |
| | 1217 | +Restriction was put on $4 at $5 and expires on $6 at $7. |
| 1218 | 1218 | |
| 1219 | 1219 | You can contact [[User:$2|$2]] or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the restriction.", |
| | 1220 | +'userrestricted-page-indef' => '<big>\'\'\'Your user name or IP address has been restricted from editing page "$1".\'\'\'</big> |
| 1220 | 1221 | |
| | 1222 | +The restriction was put by [[User:$2|$2]]. |
| | 1223 | +The reason given is \'\'$3\'\'. |
| | 1224 | + |
| | 1225 | +Restriction was put at $4 and will not expire. |
| | 1226 | + |
| | 1227 | +You can contact [[User:$2|$2]] or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the restriction.', |
| | 1228 | +'userrestricted-namespace-indef' => "<big>'''Your user name or IP address has been restricted from editing $1 namespace.'''</big> |
| | 1229 | + |
| | 1230 | +The restriction was put by [[User:$2|$2]]. |
| | 1231 | +The reason given is ''$3''. |
| | 1232 | + |
| | 1233 | +Restriction was put at $4 and will not expire. |
| | 1234 | + |
| | 1235 | +You can contact [[User:$2|$2]] or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the restriction.", |
| | 1236 | + |
| 1221 | 1237 | # Parser/template warnings |
| 1222 | 1238 | 'expensive-parserfunction-warning' => 'Warning: This page contains too many expensive parser function calls. |
| 1223 | 1239 | |
| — | — | @@ -2596,7 +2612,7 @@ |
| 2597 | 2613 | [[Special:Ipblocklist|Blocks]] are not listed here.', |
| 2598 | 2614 | 'listuserrestrictions-row-ns' => 'restricted $1 from editing $2 namespace ($3)', |
| 2599 | 2615 | 'listuserrestrictions-row-page' => 'restricted $1 from editing $2 ($3)', |
| 2600 | | -'listuserrestrictions-row-expiry' => 'expires at $1', |
| | 2616 | +'listuserrestrictions-row-expiry' => 'expires on $1 at $2', |
| 2601 | 2617 | 'listuserrestrictions-legend' => 'Find a restriction', |
| 2602 | 2618 | 'listuserrestrictions-type' => 'Type:', |
| 2603 | 2619 | 'listuserrestrictions-user' => 'User:', |