X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=blobdiff_plain;f=languages%2FLanguage.php;h=190f2bfe78e3c4370042f9f4d78489c5009dd31f;hb=e96c81bab59f8d099c6e3a897b359b464aed9192;hp=80aacb56b3346de66ecdd862b2c72add4f262dd6;hpb=aeba9bac37eab0afb4dcb3784e508d6565cbed42;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index 80aacb56b3..190f2bfe78 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1555,7 +1555,7 @@ class Language {
 	 *
 	 * @param string $ts
 	 *
-	 * @return string
+	 * @return int[]
 	 */
 	private static function tsToIranian( $ts ) {
 		$gy = substr( $ts, 0, 4 ) -1600;
@@ -1613,7 +1613,7 @@ class Language {
 	 *
 	 * @param string $ts
 	 *
-	 * @return string
+	 * @return int[]
 	 */
 	private static function tsToHijri( $ts ) {
 		$year = substr( $ts, 0, 4 );
@@ -1665,7 +1665,7 @@ class Language {
 	 *
 	 * @param string $ts
 	 *
-	 * @return string
+	 * @return int[]
 	 */
 	private static function tsToHebrew( $ts ) {
 		# Parse date
@@ -3895,10 +3895,11 @@ class Language {
 	 * match up with it.
 	 *
 	 * @param string $str The validated block duration in English
+	 * @param User $user User object to use timezone from or null for $wgUser
 	 * @return string Somehow translated block duration
 	 * @see LanguageFi.php for example implementation
 	 */
-	function translateBlockExpiry( $str ) {
+	function translateBlockExpiry( $str, User $user = null ) {
 		$duration = SpecialBlock::getSuggestedDurations( $this );
 		foreach ( $duration as $show => $value ) {
 			if ( strcmp( $str, $value ) == 0 ) {
@@ -3924,10 +3925,12 @@ class Language {
 		} else { // It's an absolute timestamp.
 			if ( $time === 0 ) {
 				// wfTimestamp() handles 0 as current time instead of epoch.
-				return $this->timeanddate( '19700101000000' );
-			} else {
-				return $this->timeanddate( $time );
+				$time = '19700101000000';
+			}
+			if ( $user ) {
+				return $this->userTimeAndDate( $time, $user );
 			}
+			return $this->timeanddate( $time );
 		}
 	}