Split date ($2) and time ($3) in 'protect-existing-expiry' per request of a translato...

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index c2ab2e3..a957a70 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -331,9 +331,12 @@ class ProtectionForm {
 
                        $expiryFormOptions = '';
                        if ( $this->mExistingExpiry[$action] && $this->mExistingExpiry[$action] != 'infinity' ) {
+                               $timestamp = $wgLang->timeanddate( $this->mExistingExpiry[$action] );
+                               $d = $wgLang->date( $this->mExistingExpiry[$action] );
+                               $t = $wgLang->time( $this->mExistingExpiry[$action] );
                                $expiryFormOptions .= 
                                        Xml::option( 
-                                               wfMsg( 'protect-existing-expiry', $wgLang->timeanddate( $this->mExistingExpiry[$action] ) ),
+                                               wfMsg( 'protect-existing-expiry', $timestamp, $d, $t ),
                                                'existing',
                                                $this->mExpirySelection[$action] == 'existing'
                                        ) . "\n";

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 0133c1c..9ae83a2 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2388,7 +2388,7 @@ You can change this page's protection level, but it will not affect the cascadin
 'protect-cantedit'            => 'You cannot change the protection levels of this page, because you do not have permission to edit it.',
 'protect-othertime'           => 'Other time:',
 'protect-othertime-op'        => 'other time',
-'protect-existing-expiry'     => 'Existing expiry time: $1',
+'protect-existing-expiry'     => 'Existing expiry time: $3, $2',
 'protect-otherreason'         => 'Other/additional reason:',
 'protect-otherreason-op'      => 'other/additional reason',
 'protect-dropdown'            => '*Common protection reasons