Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

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

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index 994adc6..6e3f658 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -10,7 +10,7 @@
  */
 function wfSpecialAllmessages() {
        global $wgOut, $wgRequest, $wgMessageCache, $wgTitle;
-       global $wgUseDatabaseMessages, $wgLang, $wgContLang;
+       global $wgUseDatabaseMessages;
 
        # The page isn't much use if the MediaWiki namespace is not being used
        if( !$wgUseDatabaseMessages ) {
@@ -32,17 +32,11 @@ function wfSpecialAllmessages() {
        $first = true;
        $sortedArray = array_merge( Language::getMessagesFor( 'en' ), $wgMessageCache->getExtensionMessagesFor( 'en' ) );
        ksort( $sortedArray );
-       $contentCode = $wgContLang->getCode();
-       $fallback = Language::getFallbackFor( $wgLang->getCode() );
        $messages = array();
        $wgMessageCache->disableTransform();
 
-       foreach ( array_keys( $sortedArray ) as $key ) {
-               if ( $contentCode == $fallback ) {
-                       $messages[$key]['fallbackmsg'] = wfMsgNoDbForContent( $key );
-               } else {
-                       $messages[$key]['fallbackmsg'] = wfMsgNoDb( "$key/$fallback" );
-               }
+       foreach ( $sortedArray as $key => $value ) {
+               $messages[$key]['enmsg'] = $value;
                $messages[$key]['statmsg'] = wfMsgNoDb( $key );
                $messages[$key]['msg'] = wfMsg ( $key );
        }
@@ -71,7 +65,7 @@ function makePhp($messages) {
        global $wgLang;
        $txt = "\n\n\$messages = array(\n";
        foreach( $messages as $key => $m ) {
-               if($wgLang->getCode() != 'en' and $m['msg'] == $m['fallbackmsg'] ) {
+               if($wgLang->getCode() != 'en' and $m['msg'] == $m['enmsg'] ) {
                        //if (strstr($m['msg'],"\n")) {
                        //      $txt.='/* ';
                        //      $comment=' */';
@@ -80,7 +74,7 @@ function makePhp($messages) {
                        //      $comment = '';
                        //}
                        continue;
-               } elseif ($m['msg'] == '<'.$key.'>'){
+               } elseif ( wfEmptyMsg( $key, $m['msg'] ) ) {
                        $m['msg'] = '';
                        $comment = ' #empty';
                } else {