From a59d8ef01e302439ac9fba9f3daaa2337c464fe2 Mon Sep 17 00:00:00 2001
From: Purodha B Blissenbach <purodha@users.mediawiki.org>
Date: Sun, 4 Jan 2009 14:37:35 +0000
Subject: [PATCH] MediaWiki:Protect-expiring needs to have date and time
 separated.

---
 includes/Article.php                         | 4 +++-
 includes/Title.php                           | 2 +-
 includes/specials/SpecialProtectedpages.php  | 2 +-
 includes/specials/SpecialProtectedtitles.php | 2 +-
 languages/messages/MessagesKsh.php           | 2 +-
 languages/messages/MessagesQqq.php           | 6 +++++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 2ffd24a55f..706f2b5b31 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1943,7 +1943,9 @@ class Article {
 						$protect_description .= "[$action=$restrictions] (";
 						if( $encodedExpiry[$action] != 'infinity' ) {
 							$protect_description .= wfMsgForContent( 'protect-expiring', 
-								$wgContLang->timeanddate( $expiry[$action], false, false ) ); 	 
+								$wgContLang->timeanddate( $expiry[$action], false, false ) ,
+								$wgContLang->date( $expiry[$action], false, false ) ,
+								$wgContLang->time( $expiry[$action], false, false ) ); 	 
 						} else {
 							$protect_description .= wfMsgForContent( 'protect-expiry-indefinite' );
 						}
diff --git a/includes/Title.php b/includes/Title.php
index c8ad9b80c2..95b2e51476 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1319,7 +1319,7 @@ class Title {
 
 		$expiry_description = '';
 		if ( $encodedExpiry != 'infinity' ) {
-			$expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) ).')';
+			$expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) , $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
 		}
 		else {
 			$expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ).')';
diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index e59885503b..73ce43f316 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -84,7 +84,7 @@ class ProtectedPagesForm {
 		if ( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) {
 			$expiry = Block::decodeExpiry( $row->pr_expiry );
 
-			$expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) );
+			$expiry_description = wfMsgForContent( 'protect-expiring' , $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
 
 			$description_items[] = $expiry_description;
 		}
diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index 390103e12a..7a3946382e 100644
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -75,7 +75,7 @@ class ProtectedTitlesForm {
 		if ( $row->pt_expiry != 'infinity' && strlen($row->pt_expiry) ) {
 			$expiry = Block::decodeExpiry( $row->pt_expiry );
 
-			$expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) );
+			$expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
 
 			$description_items[] = $expiry_description;
 		}
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index c2065cce3f..847f376b55 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -2106,7 +2106,7 @@ Di Sigg <strong>„$1“:</strong> es jetz jrad:',
 'protect-level-autoconfirmed' => 'nor Metmaacher dranlooße, die sich aanjemeldt han',
 'protect-level-sysop'         => 'Nor de Wiki-Köbesse dranlooße',
 'protect-summary-cascade'     => 'met Schotz-Kaskad',
-'protect-expiring'            => 'bes $1 (UTC)',
+'protect-expiring'            => 'bes öm $2 Uhr (UTC) aam $3',
 'protect-expiry-indefinite'   => 'för iewich',
 'protect-cascade'             => 'Maach en Schoz-Kaskaade — all de Schablone en dä Sigg krijje dersellve Schoz, wi die Sigg sellver en kritt.',
 'protect-cantedit'            => 'Do kanns dä Siggeschotz hee nit ändere, esu lang wie De di Sigg nit ändere darfs.',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index ba88df4280..1a026d9360 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1624,7 +1624,11 @@ Shown as subtitle of the protection form. $1 is the title of the page to be (un)
 'protect-default'           => '{{Identical|Default}}',
 'protect-fallback'          => 'This message is used as an option in the protection form on wikis were extra protection levels have been configured.',
 'protect-summary-cascade'   => 'Used in edit summary when cascade protecting a page.',
-'protect-expiring'          => 'Used in page history.
+'protect-expiring'          => 'Used in page history, and in [[Special:Protectedtitles]], [[Special:Protectedpages]].
+
+$1 = date and time,
+$2 = date,
+$3 = time.
 
 {{Identical|Expires $1 (UTC)}}',
 'protect-cascade'           => 'See [[meta:Protect]] for more information.',
-- 
2.20.1