| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -844,8 +844,9 @@ |
| 845 | 845 | $expirystr = $msg['infiniteblock']; |
| 846 | 846 | } else { |
| 847 | 847 | global $wgLang; |
| 848 | | - $expiretimestr = htmlspecialchars($wgLang->timeanddate( $expiry, true )); |
| 849 | | - $expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array($expiretimestr) ); |
| | 848 | + $expiredatestr = htmlspecialchars($wgLang->date( $expiry, true )); |
| | 849 | + $expiretimestr = htmlspecialchars($wgLang->time( $expiry, true )); |
| | 850 | + $expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array( $expiredatestr, $expiretimestr ) ); |
| 850 | 851 | } |
| 851 | 852 | return $expirystr; |
| 852 | 853 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2677,7 +2677,7 @@ |
| 2678 | 2678 | 'ipblocklist-submit' => 'Search', |
| 2679 | 2679 | 'blocklistline' => '$1, $2 blocked $3 ($4)', |
| 2680 | 2680 | 'infiniteblock' => 'infinite', |
| 2681 | | -'expiringblock' => 'expires $1', |
| | 2681 | +'expiringblock' => 'expires on $1 at $2', |
| 2682 | 2682 | 'anononlyblock' => 'anon. only', |
| 2683 | 2683 | 'noautoblockblock' => 'autoblock disabled', |
| 2684 | 2684 | 'createaccountblock' => 'account creation blocked', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -62,7 +62,8 @@ |
| 63 | 63 | * (bug 18466) Add note or warning when overruling a move (semi-)protection |
| 64 | 64 | * (bug 18342) insertTags works in edit summary box |
| 65 | 65 | * (bug 18411) The upload form also checks post_max_size |
| 66 | | -* Watchlist now has a specialized <div> tag that contains a unique class for each page |
| | 66 | +* Watchlist now has a specialized <div> tag that contains a unique class for |
| | 67 | + each page |
| 67 | 68 | * Added Minguo calendar support for the Taiwan Chinese language |
| 68 | 69 | * Database: unionQueries function to be used for UNION sql construction, so |
| 69 | 70 | it can be overloaded on DB abstraction level for DB specific functionality |
| — | — | @@ -71,6 +72,7 @@ |
| 72 | 73 | month number without the leading zero |
| 73 | 74 | * (bug 13456) categoriespagetext supports PLURAL |
| 74 | 75 | * (bug 18860) Blocks of IPs affecting registered users can now block email |
| | 76 | +* (bug 17093) Date and time are separate parameters in Special:BlockList |
| 75 | 77 | |
| 76 | 78 | === Bug fixes in 1.16 === |
| 77 | 79 | |