* Check existence in correct language

* Simplify a bit existence check

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index afebd4d..6da6f87 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -403,8 +403,8 @@ class SpecialContributions extends SpecialPage {
                                Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) . ' ' .
                                Xml::submitButton( wfMsg( 'sp-contributions-submit' ) )
                        ) . ' ';
-               $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
-               if( !wfEmptyMsg( 'sp-contributions-explain' ) ) {
+               $explain = wfMessage( 'sp-contributions-explain' );
+               if ( $explain->exists() ) {
                        $f .= "<p id='mw-sp-contributions-explain'>{$explain}</p>";
                }
                $f .= Xml::closeElement('fieldset' ) .

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1332ae7..223336a 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -531,9 +531,9 @@ class LanguageConverter {
                        $text = '';
                } else {
                        // first let's check if a message has given us a converted name
-                       $nsConvKey = 'conversion-ns' . $index;
-                       if ( !wfEmptyMsg( $nsConvKey ) ) {
-                               $text = wfMsgForContentNoTrans( $nsConvKey );
+                       $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inContentLanguage();
+                       if ( $nsConvMsg->exists() ) {
+                               $text = $nsConvMsg->plain();
                        } else {
                                // the message does not exist, try retrieve it from the current
                                // variant's namespace names.