From 67740ef9cb0d8cb034fa48412cd8944aca7dc490 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 30 Sep 2008 19:03:22 +0000 Subject: [PATCH] Tweak for r41431: also use wfMsgExt() in Language::getMessageFromDB() --- languages/Language.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) 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 ) { -- 2.20.1