X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguage.php;h=a0fa7277933598837e90cacb75901aae8bc2af55;hb=e523771f05050bf415da36b07d9a0fa0e2150d28;hp=f13f9d684b26bb63a5e4908eedd1e1c9cc135147;hpb=2c0625ed9e1b8ca88e58515c193adae52ef3e24b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index f13f9d684b..a0fa727793 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -30,9 +30,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit( 1 );
 }
 
-if ( function_exists( 'mb_strtoupper' ) ) {
-	mb_internal_encoding( 'UTF-8' );
-}
+mb_internal_encoding( 'UTF-8' );
 
 use CLDRPluralRuleParser\Evaluator;
 
@@ -2592,7 +2590,7 @@ class Language {
 		return $text;
 	}
 
-	// callback functions for uc(), lc(), ucwords(), ucwordbreaks()
+	// callback functions for ucwords(), ucwordbreaks()
 
 	/**
 	 * @param array $matches
@@ -2610,24 +2608,6 @@ class Language {
 		return mb_strtoupper( $matches[0] );
 	}
 
-	/**
-	 * @param array $matches
-	 * @return string
-	 */
-	function ucCallback( $matches ) {
-		list( $wikiUpperChars ) = self::getCaseMaps();
-		return strtr( $matches[1], $wikiUpperChars );
-	}
-
-	/**
-	 * @param array $matches
-	 * @return string
-	 */
-	function lcCallback( $matches ) {
-		list( , $wikiLowerChars ) = self::getCaseMaps();
-		return strtr( $matches[1], $wikiLowerChars );
-	}
-
 	/**
 	 * @param array $matches
 	 * @return string
@@ -2636,15 +2616,6 @@ class Language {
 		return mb_strtoupper( $matches[0] );
 	}
 
-	/**
-	 * @param array $matches
-	 * @return string
-	 */
-	function ucwordsCallbackWiki( $matches ) {
-		list( $wikiUpperChars ) = self::getCaseMaps();
-		return strtr( $matches[0], $wikiUpperChars );
-	}
-
 	/**
 	 * Make a string's first character uppercase
 	 *
@@ -2673,27 +2644,14 @@ class Language {
 	 * @return string
 	 */
 	function uc( $str, $first = false ) {
-		if ( function_exists( 'mb_strtoupper' ) ) {
-			if ( $first ) {
-				if ( $this->isMultibyte( $str ) ) {
-					return mb_strtoupper( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 );
-				} else {
-					return ucfirst( $str );
-				}
-			} else {
-				return $this->isMultibyte( $str ) ? mb_strtoupper( $str ) : strtoupper( $str );
-			}
-		} else {
+		if ( $first ) {
 			if ( $this->isMultibyte( $str ) ) {
-				$x = $first ? '^' : '';
-				return preg_replace_callback(
-					"/$x([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/",
-					[ $this, 'ucCallback' ],
-					$str
-				);
+				return mb_strtoupper( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 );
 			} else {
-				return $first ? ucfirst( $str ) : strtoupper( $str );
+				return ucfirst( $str );
 			}
+		} else {
+			return $this->isMultibyte( $str ) ? mb_strtoupper( $str ) : strtoupper( $str );
 		}
 	}
 
@@ -2721,27 +2679,14 @@ class Language {
 	 * @return mixed|string
 	 */
 	function lc( $str, $first = false ) {
-		if ( function_exists( 'mb_strtolower' ) ) {
-			if ( $first ) {
-				if ( $this->isMultibyte( $str ) ) {
-					return mb_strtolower( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 );
-				} else {
-					return strtolower( substr( $str, 0, 1 ) ) . substr( $str, 1 );
-				}
-			} else {
-				return $this->isMultibyte( $str ) ? mb_strtolower( $str ) : strtolower( $str );
-			}
-		} else {
+		if ( $first ) {
 			if ( $this->isMultibyte( $str ) ) {
-				$x = $first ? '^' : '';
-				return preg_replace_callback(
-					"/$x([A-Z]|[\\xc0-\\xff][\\x80-\\xbf]*)/",
-					[ $this, 'lcCallback' ],
-					$str
-				);
+				return mb_strtolower( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 );
 			} else {
-				return $first ? strtolower( substr( $str, 0, 1 ) ) . substr( $str, 1 ) : strtolower( $str );
+				return strtolower( substr( $str, 0, 1 ) ) . substr( $str, 1 );
 			}
+		} else {
+			return $this->isMultibyte( $str ) ? mb_strtolower( $str ) : strtolower( $str );
 		}
 	}
 
@@ -2765,19 +2710,11 @@ class Language {
 			$replaceRegexp = "/^([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)| ([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/";
 
 			// function to use to capitalize a single char
-			if ( function_exists( 'mb_strtoupper' ) ) {
-				return preg_replace_callback(
-					$replaceRegexp,
-					[ $this, 'ucwordsCallbackMB' ],
-					$str
-				);
-			} else {
-				return preg_replace_callback(
-					$replaceRegexp,
-					[ $this, 'ucwordsCallbackWiki' ],
-					$str
-				);
-			}
+			return preg_replace_callback(
+				$replaceRegexp,
+				[ $this, 'ucwordsCallbackMB' ],
+				$str
+			);
 		} else {
 			return ucwords( strtolower( $str ) );
 		}
@@ -2800,19 +2737,11 @@ class Language {
 			$replaceRegexp = "/^([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)|" .
 				"$breaks([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/";
 
-			if ( function_exists( 'mb_strtoupper' ) ) {
-				return preg_replace_callback(
-					$replaceRegexp,
-					[ $this, 'ucwordbreaksCallbackMB' ],
-					$str
-				);
-			} else {
-				return preg_replace_callback(
-					$replaceRegexp,
-					[ $this, 'ucwordsCallbackWiki' ],
-					$str
-				);
-			}
+			return preg_replace_callback(
+				$replaceRegexp,
+				[ $this, 'ucwordbreaksCallbackMB' ],
+				$str
+			);
 		} else {
 			return preg_replace_callback(
 				'/\b([\w\x80-\xff]+)\b/',
@@ -3966,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 ) {
@@ -3995,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 );
 		}
 	}
 
@@ -4496,26 +4428,6 @@ class Language {
 		return $this->convertGrammar( trim( $m[2] ), trim( $m[1] ) );
 	}
 
-	/**
-	 * @throws MWException
-	 * @return array
-	 */
-	static function getCaseMaps() {
-		static $wikiUpperChars, $wikiLowerChars;
-		if ( isset( $wikiUpperChars ) ) {
-			return [ $wikiUpperChars, $wikiLowerChars ];
-		}
-
-		$arr = wfGetPrecompiledData( 'Utf8Case.ser' );
-		if ( $arr === false ) {
-			throw new MWException(
-				"Utf8Case.ser is missing, please run \"make\" in the serialized directory\n" );
-		}
-		$wikiUpperChars = $arr['wikiUpperChars'];
-		$wikiLowerChars = $arr['wikiLowerChars'];
-		return [ $wikiUpperChars, $wikiLowerChars ];
-	}
-
 	/**
 	 * Decode an expiry (block, protection, etc) which has come from the DB
 	 *