X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStatus.php;h=cc7abc8200f23f9be33ae31b23f2141d05cc1ed3;hb=2873ccba9464db79bc7d6b0e5cd330703b919235;hp=752cc5dc06252d126bdf18c2a2ee4322445df394;hpb=4f7d15021d77f0bb4846fc405540a98a12742223;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Status.php b/includes/Status.php
index 752cc5dc06..cc7abc8200 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -44,7 +44,7 @@ class Status {
 	/** @var mixed */
 	public $value;
 	/** @var array Map of (key => bool) to indicate success of each part of batch operations */
-	public $success = array();
+	public $success = [];
 	/** @var int Counter for batch operations */
 	public $successCount = 0;
 	/** @var int Counter for batch operations */
@@ -88,7 +88,7 @@ class Status {
 	 */
 	public static function newFatal( $message /*, parameters...*/ ) {
 		return new self( call_user_func_array(
-			array( 'StatusValue', 'newFatal' ), func_get_args()
+			[ 'StatusValue', 'newFatal' ], func_get_args()
 		) );
 	}
 
@@ -140,7 +140,7 @@ class Status {
 	 * @param string|Message $message Message name or object
 	 */
 	public function warning( $message /*, parameters... */ ) {
-		call_user_func_array( array( $this->sv, 'warning' ), func_get_args() );
+		call_user_func_array( [ $this->sv, 'warning' ], func_get_args() );
 	}
 
 	/**
@@ -150,7 +150,7 @@ class Status {
 	 * @param string|Message $message Message name or object
 	 */
 	public function error( $message /*, parameters... */ ) {
-		call_user_func_array( array( $this->sv, 'error' ), func_get_args() );
+		call_user_func_array( [ $this->sv, 'error' ], func_get_args() );
 	}
 
 	/**
@@ -160,7 +160,7 @@ class Status {
 	 * @param string|Message $message Message name or object
 	 */
 	public function fatal( $message /*, parameters... */ ) {
-		call_user_func_array( array( $this->sv, 'fatal' ), func_get_args() );
+		call_user_func_array( [ $this->sv, 'fatal' ], func_get_args() );
 	}
 
 	/**
@@ -171,22 +171,43 @@ class Status {
 		if ( !$this->cleanCallback ) {
 			return $params;
 		}
-		$cleanParams = array();
+		$cleanParams = [];
 		foreach ( $params as $i => $param ) {
 			$cleanParams[$i] = call_user_func( $this->cleanCallback, $param );
 		}
 		return $cleanParams;
 	}
 
+	/**
+	 * @param string|Language|null $lang Language to use for processing
+	 *  messages, or null to default to the user language.
+	 * @return Language
+	 */
+	protected function languageFromParam( $lang ) {
+		global $wgLang;
+
+		if ( $lang === null ) {
+			// @todo: Use RequestContext::getMain()->getLanguage() instead
+			return $wgLang;
+		} elseif ( $lang instanceof Language || $lang instanceof StubUserLang ) {
+			return $lang;
+		} else {
+			return Language::factory( $lang );
+		}
+	}
+
 	/**
 	 * Get the error list as a wikitext formatted list
 	 *
 	 * @param string|bool $shortContext A short enclosing context message name, to
 	 *        be used when there is a single error
 	 * @param string|bool $longContext A long enclosing context message name, for a list
+	 * @param string|Language $lang Language to use for processing messages
 	 * @return string
 	 */
-	public function getWikiText( $shortContext = false, $longContext = false ) {
+	public function getWikiText( $shortContext = false, $longContext = false, $lang = null ) {
+		$lang = $this->languageFromParam( $lang );
+
 		$rawErrors = $this->sv->getErrors();
 		if ( count( $rawErrors ) == 0 ) {
 			if ( $this->sv->isOK() ) {
@@ -199,22 +220,22 @@ class Status {
 			$rawErrors = $this->sv->getErrors(); // just added a fatal
 		}
 		if ( count( $rawErrors ) == 1 ) {
-			$s = $this->getErrorMessage( $rawErrors[0] )->plain();
+			$s = $this->getErrorMessage( $rawErrors[0], $lang )->plain();
 			if ( $shortContext ) {
-				$s = wfMessage( $shortContext, $s )->plain();
+				$s = wfMessage( $shortContext, $s )->inLanguage( $lang )->plain();
 			} elseif ( $longContext ) {
-				$s = wfMessage( $longContext, "* $s\n" )->plain();
+				$s = wfMessage( $longContext, "* $s\n" )->inLanguage( $lang )->plain();
 			}
 		} else {
-			$errors = $this->getErrorMessageArray( $rawErrors );
+			$errors = $this->getErrorMessageArray( $rawErrors, $lang );
 			foreach ( $errors as &$error ) {
 				$error = $error->plain();
 			}
 			$s = '* ' . implode( "\n* ", $errors ) . "\n";
 			if ( $longContext ) {
-				$s = wfMessage( $longContext, $s )->plain();
+				$s = wfMessage( $longContext, $s )->inLanguage( $lang )->plain();
 			} elseif ( $shortContext ) {
-				$s = wfMessage( $shortContext, "\n$s\n" )->plain();
+				$s = wfMessage( $shortContext, "\n$s\n" )->inLanguage( $lang )->plain();
 			}
 		}
 		return $s;
@@ -227,10 +248,12 @@ class Status {
 	 * message names), to be used when there is a single error.
 	 * @param string|string[] $longContext A long enclosing context message name (or an array of
 	 * message names), for a list.
-	 *
+	 * @param string|Language $lang Language to use for processing messages
 	 * @return Message
 	 */
-	public function getMessage( $shortContext = false, $longContext = false ) {
+	public function getMessage( $shortContext = false, $longContext = false, $lang = null ) {
+		$lang = $this->languageFromParam( $lang );
+
 		$rawErrors = $this->sv->getErrors();
 		if ( count( $rawErrors ) == 0 ) {
 			if ( $this->sv->isOK() ) {
@@ -243,16 +266,16 @@ class Status {
 			$rawErrors = $this->sv->getErrors(); // just added a fatal
 		}
 		if ( count( $rawErrors ) == 1 ) {
-			$s = $this->getErrorMessage( $rawErrors[0] );
+			$s = $this->getErrorMessage( $rawErrors[0], $lang );
 			if ( $shortContext ) {
-				$s = wfMessage( $shortContext, $s );
+				$s = wfMessage( $shortContext, $s )->inLanguage( $lang );
 			} elseif ( $longContext ) {
 				$wrapper = new RawMessage( "* \$1\n" );
 				$wrapper->params( $s )->parse();
-				$s = wfMessage( $longContext, $wrapper );
+				$s = wfMessage( $longContext, $wrapper )->inLanguage( $lang );
 			}
 		} else {
-			$msgs = $this->getErrorMessageArray( $rawErrors );
+			$msgs = $this->getErrorMessageArray( $rawErrors, $lang );
 			$msgCount = count( $msgs );
 
 			if ( $shortContext ) {
@@ -263,11 +286,11 @@ class Status {
 			$s->params( $msgs )->parse();
 
 			if ( $longContext ) {
-				$s = wfMessage( $longContext, $s );
+				$s = wfMessage( $longContext, $s )->inLanguage( $lang );
 			} elseif ( $shortContext ) {
-				$wrapper = new RawMessage( "\n\$1\n", $s );
+				$wrapper = new RawMessage( "\n\$1\n", [ $s ] );
 				$wrapper->parse();
-				$s = wfMessage( $shortContext, $wrapper );
+				$s = wfMessage( $shortContext, $wrapper )->inLanguage( $lang );
 			}
 		}
 
@@ -280,10 +303,10 @@ class Status {
 	 * 'message' and 'params', use those keys-value pairs.
 	 * Otherwise, if its an array, just use the first value as the
 	 * message and the remaining items as the params.
-	 *
+	 * @param string|Language $lang Language to use for processing messages
 	 * @return Message
 	 */
-	protected function getErrorMessage( $error ) {
+	protected function getErrorMessage( $error, $lang = null ) {
 		if ( is_array( $error ) ) {
 			if ( isset( $error['message'] ) && $error['message'] instanceof Message ) {
 				$msg = $error['message'];
@@ -298,6 +321,8 @@ class Status {
 		} else {
 			$msg = wfMessage( $error );
 		}
+
+		$msg->inLanguage( $this->languageFromParam( $lang ) );
 		return $msg;
 	}
 
@@ -307,21 +332,27 @@ class Status {
 	 * @param string $shortContext A short enclosing context message name, to
 	 *        be used when there is a single error
 	 * @param string $longContext A long enclosing context message name, for a list
+	 * @param string|Language $lang Language to use for processing messages
 	 * @return string
 	 */
-	public function getHTML( $shortContext = false, $longContext = false ) {
-		$text = $this->getWikiText( $shortContext, $longContext );
-		$out = MessageCache::singleton()->parse( $text, null, true, true );
+	public function getHTML( $shortContext = false, $longContext = false, $lang = null ) {
+		$lang = $this->languageFromParam( $lang );
+		$text = $this->getWikiText( $shortContext, $longContext, $lang );
+		$out = MessageCache::singleton()->parse( $text, null, true, true, $lang );
 		return $out instanceof ParserOutput ? $out->getText() : $out;
 	}
 
 	/**
 	 * Return an array with a Message object for each error.
 	 * @param array $errors
+	 * @param string|Language $lang Language to use for processing messages
 	 * @return Message[]
 	 */
-	protected function getErrorMessageArray( $errors ) {
-		return array_map( array( $this, 'getErrorMessage' ), $errors );
+	protected function getErrorMessageArray( $errors, $lang = null ) {
+		$lang = $this->languageFromParam( $lang );
+		return array_map( function ( $e ) use ( $lang ) {
+			return $this->getErrorMessage( $e, $lang );
+		}, $errors );
 	}
 
 	/**
@@ -365,19 +396,19 @@ class Status {
 	 * @return array
 	 */
 	protected function getStatusArray( $type = false ) {
-		$result = array();
+		$result = [];
 
 		foreach ( $this->sv->getErrors() as $error ) {
 			if ( $type === false || $error['type'] === $type ) {
 				if ( $error['message'] instanceof MessageSpecifier ) {
 					$result[] = array_merge(
-						array( $error['message']->getKey() ),
+						[ $error['message']->getKey() ],
 						$error['message']->getParams()
 					);
 				} elseif ( $error['params'] ) {
-					$result[] = array_merge( array( $error['message'] ), $error['params'] );
+					$result[] = array_merge( [ $error['message'] ], $error['params'] );
 				} else {
-					$result[] = array( $error['message'] );
+					$result[] = [ $error['message'] ];
 				}
 			}
 		}
@@ -474,7 +505,7 @@ class Status {
 	 */
 	function __sleep() {
 		$keys = array_keys( get_object_vars( $this ) );
-		return array_diff( $keys, array( 'cleanCallback' ) );
+		return array_diff( $keys, [ 'cleanCallback' ] );
 	}
 
 	/**