From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Mon, 6 Oct 2008 20:01:43 +0000 (+0000)
Subject: Split date ($2) and time ($3) in 'protect-existing-expiry' per request of a translato... 
X-Git-Tag: 1.31.0-rc.0~44872
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=c678efcab2b739f7051fda74dcadf4502a184225;p=lhc%2Fweb%2Fwiklou.git

Split date ($2) and time ($3) in 'protect-existing-expiry' per request of a translator. Leaving the old timestamp ($1) in for backward compatibility.
---

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index c2ab2e3aa9..a957a70a19 100644
--- 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 0133c1ce18..9ae83a2aba 100644
--- 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