| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -458,8 +458,6 @@ |
| 459 | 459 | 'blockedtitle', |
| 460 | 460 | 'blockedtext', |
| 461 | 461 | 'autoblockedtext', |
| 462 | | - 'blockedtext-concise', |
| 463 | | - 'autoblockedtext-concise', |
| 464 | 462 | 'blockedoriginalsource', |
| 465 | 463 | 'blockededitsource', |
| 466 | 464 | 'whitelistedittitle', |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1066,6 +1066,7 @@ |
| 1067 | 1067 | $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]"; |
| 1068 | 1068 | $blockid = $block->mId; |
| 1069 | 1069 | $blockExpiry = $user->mBlock->mExpiry; |
| | 1070 | + $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true ); |
| 1070 | 1071 | |
| 1071 | 1072 | if ( $blockExpiry == 'infinity' ) { |
| 1072 | 1073 | // Entry in database (table ipblocks) is 'infinity' but 'ipboptions' uses 'infinite' or 'indefinite' |
| — | — | @@ -1088,7 +1089,7 @@ |
| 1089 | 1090 | |
| 1090 | 1091 | $intended = $user->mBlock->mAddress; |
| 1091 | 1092 | |
| 1092 | | - $errors[] = array ( ($block->mAuto ? 'autoblockedtext-concise' : 'blockedtext-concise'), $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ); |
| | 1093 | + $errors[] = array ( ($block->mAuto ? 'autoblockedtext' : 'blockedtext'), $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ); |
| 1093 | 1094 | } |
| 1094 | 1095 | |
| 1095 | 1096 | return $errors; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -979,12 +979,6 @@ |
| 980 | 980 | registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it. |
| 981 | 981 | |
| 982 | 982 | Your block ID is $5. Please include this ID in any queries you make.', |
| 983 | | -'blockedtext-concise' => "$7, which matches your username or IP address, has been blocked by $1. The reason given was $2. The expiry time of this block is $6. To discuss the block, you can |
| 984 | | -contact $1, or another administrator. You cannot use the 'email this user' feature unless a valid email address is specified in your account preferences and you have not been blocked from using it. |
| 985 | | -Your current IP address is $3, and the block ID is #$5. Please include either or both of these in any queries.", |
| 986 | | -'autoblockedtext-concise' => "Your IP address has recently been used by a user who was blocked. The block was made by $1. The reason given was $2. The expiry time of this block is $6. To |
| 987 | | -discuss the block, you can contact $1, or another administrator. You cannot use the 'email this user' feature unless a valid email address is specified in your account preferences and you have not |
| 988 | | -been blocked from using it. Your current IP address is $3, and the block ID is #$5. Please include either or both of these in any queries.", |
| 989 | 983 | 'blockedoriginalsource' => "The source of '''$1''' is |
| 990 | 984 | shown below:", |
| 991 | 985 | 'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:", |