From: Purodha B Blissenbach <purodha@users.mediawiki.org>
Date: Mon, 1 Jun 2009 20:57:11 +0000 (+0000)
Subject: Message 'confirmemail_body' - date and time separated as of request by user "Der... 
X-Git-Tag: 1.31.0-rc.0~41554
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=eb9b0f5be21e7c7436035a9d5e3c79eec5284c78;p=lhc%2Fweb%2Fwiklou.git

Message 'confirmemail_body' - date and time separated as of request by user "Der Umherirrende" at
http://translatewiki.net/w/i.php?title=Support&oldid=1243738#split_date_and_time
---

diff --git a/includes/User.php b/includes/User.php
index e168fe9a29..c1cab666df 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2840,7 +2840,9 @@ class User {
 				$this->getName(),
 				$url,
 				$wgLang->timeanddate( $expiration, false ),
-				$invalidateURL ) );
+				$invalidateURL,
+				$wgLang->date( $expiration, false ),
+				$wgLang->time( $expiration, false ) ) );
 	}
 
 	/**
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 5578910c3b..78eebc83db 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2725,8 +2725,10 @@ Please leave the link http://www.mediawiki.org/wiki/Manual:External_editors exac
 *$1 is the IP adress of the user that changed the e-mail adress
 *$2 is the name of the user
 *$3 is a URL to [[Special:ConfirmEmail]]
-*$4 is a time and date 
-*$5 is a URL to [[Special:InvalidateEmail]]',
+*$4 is a time and date (duplicated by $6 and $7)
+*$5 is a URL to [[Special:InvalidateEmail]]
+*$6 is a date 
+*$7 is a time',
 'confirmemail_invalidated' => 'This is the text of the special page [[Special:InvalidateEmail|InvalidateEmail]] (with the title in [[Mediawiki:Invalidateemail]]) where user goes if he chooses the cancel e-mail confirmation link from the confirmation e-mail.',
 'invalidateemail'          => "This is the '''name of the special page''' where user goes if he chooses the cancel e-mail confirmation link from the confirmation e-mail.",