From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 30 Sep 2008 19:03:22 +0000 (+0000)
Subject: Tweak for r41431: also use wfMsgExt() in Language::getMessageFromDB()
X-Git-Tag: 1.31.0-rc.0~44983
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=67740ef9cb0d8cb034fa48412cd8944aca7dc490;p=lhc%2Fweb%2Fwiklou.git

Tweak for r41431: also use wfMsgExt() in Language::getMessageFromDB()
---

diff --git a/languages/Language.php b/languages/Language.php
index 4aebb0cb45..1b36bffb5d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -402,21 +402,13 @@ class Language {
 	}
 
 	/**
-	 * Ugly hack to get a message maybe from the MediaWiki namespace, if this
-	 * language object is the content or user language.
+	 * Get a message from the MediaWiki namespace.
+	 *
+	 * @param $msg String: message name
+	 * @return string
 	 */
 	function getMessageFromDB( $msg ) {
-		global $wgContLang, $wgLang;
-		if ( $wgContLang->getCode() == $this->getCode() ) {
-			# Content language
-			return wfMsgForContent( $msg );
-		} elseif ( $wgLang->getCode() == $this->getCode() ) {
-			# User language
-			return wfMsg( $msg );
-		} else {
-			# Neither, get from localisation
-			return $this->getMessage( $msg );
-		}
+		return wfMsgExt( $msg, array( 'parsemag', 'language' => $this ) );
 	}
 
 	function getLanguageName( $code ) {