Creating the function MessageCache::getExtensionMessagesFor, to get an array of the...

[lhc/web/wiklou.git] / includes / SpecialAllmessages.php

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index 60258f9..7eada4b 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -9,7 +9,7 @@
  *
  */
 function wfSpecialAllmessages() {
-       global $wgOut, $wgAllMessagesEn, $wgRequest, $wgMessageCache, $wgTitle;
+       global $wgOut, $wgRequest, $wgMessageCache, $wgTitle;
        global $wgUseDatabaseMessages;
 
        # The page isn't much use if the MediaWiki namespace is not being used
@@ -27,16 +27,16 @@ function wfSpecialAllmessages() {
        $navText = wfMsg( 'allmessagestext' );
 
        # Make sure all extension messages are available
-       wfLoadAllExtensions();
+       MessageCache::loadAllMessages();
 
        $first = true;
-       $sortedArray = array_merge( $wgAllMessagesEn, $wgMessageCache->mExtensionMessages );
+       $sortedArray = array_merge( Language::getMessagesFor( 'en' ), $wgMessageCache->getExtensionMessagesFor( 'en' ) );
        ksort( $sortedArray );
        $messages = array();
        $wgMessageCache->disableTransform();
 
        foreach ( $sortedArray as $key => $value ) {
-               $messages[$key]['enmsg'] = is_array( $value ) ? $value['en'] : $value;
+               $messages[$key]['enmsg'] = $value;
                $messages[$key]['statmsg'] = wfMsgNoDb( $key );
                $messages[$key]['msg'] = wfMsg ( $key );
        }
@@ -62,10 +62,10 @@ function wfSpecialAllmessages() {
  *
  */
 function makePhp($messages) {
-       global $wgLanguageCode;
-       $txt = "\n\n".'$wgAllMessages'.ucfirst($wgLanguageCode).' = array('."\n";
+       global $wgLang;
+       $txt = "\n\n\$messages = array(\n";
        foreach( $messages as $key => $m ) {
-               if(strtolower($wgLanguageCode) != 'en' and $m['msg'] == $m['enmsg'] ) {
+               if($wgLang->getCode() != 'en' and $m['msg'] == $m['enmsg'] ) {
                        //if (strstr($m['msg'],"\n")) {
                        //      $txt.='/* ';
                        //      $comment=' */';
@@ -90,7 +90,7 @@ function makePhp($messages) {
  *
  */
 function makeHTMLText( $messages ) {
-       global $wgLang, $wgUser, $wgLanguageCode, $wgContLanguageCode;
+       global $wgLang, $wgContLang, $wgUser;
        $fname = "makeHTMLText";
        wfProfileIn( $fname );
 
@@ -148,8 +148,8 @@ function makeHTMLText( $messages ) {
        foreach( $messages as $key => $m ) {
 
                $title = $wgLang->ucfirst( $key );
-               if($wgLanguageCode != $wgContLanguageCode)
-                       $title.="/$wgLanguageCode";
+               if($wgLang->getCode() != $wgContLang->getCode())
+                       $title.= '/' . $wgLang->getCode();
 
                $titleObj =& Title::makeTitle( NS_MEDIAWIKI, $title );
                $talkPage =& Title::makeTitle( NS_MEDIAWIKI_TALK, $title );