| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -331,9 +331,12 @@ |
| 332 | 332 | |
| 333 | 333 | $expiryFormOptions = ''; |
| 334 | 334 | if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) { |
| | 335 | + $timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action] ); |
| | 336 | + $d = $wgLang->date( $this->mExistingExpiry[$action] ); |
| | 337 | + $t = $wgLang->time( $this->mExistingExpiry[$action] ); |
| 335 | 338 | $expiryFormOptions .= |
| 336 | 339 | Xml::option( |
| 337 | | - wfMsg( 'protect-existing-expiry', $wgLang->timeanddate( $this->mExistingExpiry[$action] ) ), |
| | 340 | + wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ), |
| 338 | 341 | 'existing', |
| 339 | 342 | $this->mExpirySelection[$action] == 'existing' |
| 340 | 343 | ) . "\n"; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2388,7 +2388,7 @@ |
| 2389 | 2389 | 'protect-cantedit' => 'You cannot change the protection levels of this page, because you do not have permission to edit it.', |
| 2390 | 2390 | 'protect-othertime' => 'Other time:', |
| 2391 | 2391 | 'protect-othertime-op' => 'other time', |
| 2392 | | -'protect-existing-expiry' => 'Existing expiry time: $1', |
| | 2392 | +'protect-existing-expiry' => 'Existing expiry time: $3, $2', |
| 2393 | 2393 | 'protect-otherreason' => 'Other/additional reason:', |
| 2394 | 2394 | 'protect-otherreason-op' => 'other/additional reason', |
| 2395 | 2395 | 'protect-dropdown' => '*Common protection reasons |