Use local context to get messages

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 706a651..3951f06 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -181,17 +181,17 @@ class SpecialExport extends SpecialPage {
 
                $form = Xml::openElement( 'form', array( 'method' => 'post',
                        'action' => $this->getTitle()->getLocalUrl( 'action=submit' ) ) );
-               $form .= Xml::inputLabel( wfMsg( 'export-addcattext' )    , 'catname', 'catname', 40 ) . ' ';
-               $form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
+               $form .= Xml::inputLabel( $this->msg( 'export-addcattext' )->text(), 'catname', 'catname', 40 ) . '&#160;';
+               $form .= Xml::submitButton( $this->msg( 'export-addcat' )->text(), array( 'name' => 'addcat' ) ) . '<br />';
 
                if ( $wgExportFromNamespaces ) {
-                       $form .= Xml::namespaceSelector( $nsindex, null, 'nsindex', wfMsg( 'export-addnstext' ) ) . '&#160;';
-                       $form .= Xml::submitButton( wfMsg( 'export-addns' ), array( 'name' => 'addns' ) ) . '<br />';
+                       $form .= Xml::namespaceSelector( $nsindex, null, 'nsindex', $this->msg( 'export-addnstext' )->text() ) . '&#160;';
+                       $form .= Xml::submitButton( $this->msg( 'export-addns' )->text(), array( 'name' => 'addns' ) ) . '<br />';
                }
 
                if ( $wgExportAllowAll ) {
                        $form .= Xml::checkLabel(
-                               wfMsg( 'exportall' ),
+                               $this->msg( 'exportall' )->text(),
                                'exportall',
                                'exportall',
                                $request->wasPosted() ? $request->getCheck( 'exportall' ) : false
@@ -203,29 +203,29 @@ class SpecialExport extends SpecialPage {
 
                if( $wgExportAllowHistory ) {
                        $form .= Xml::checkLabel(
-                               wfMsg( 'exportcuronly' ),
+                               $this->msg( 'exportcuronly' )->text(),
                                'curonly',
                                'curonly',
                                $request->wasPosted() ? $request->getCheck( 'curonly' ) : true
                        ) . '<br />';
                } else {
-                       $out->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) );
+                       $out->addWikiMsg( 'exportnohistory' );
                }
 
                $form .= Xml::checkLabel(
-                       wfMsg( 'export-templates' ),
+                       $this->msg( 'export-templates' )->text(),
                        'templates',
                        'wpExportTemplates',
                        $request->wasPosted() ? $request->getCheck( 'templates' ) : false
                ) . '<br />';
 
                if( $wgExportMaxLinkDepth || $this->userCanOverrideExportDepth() ) {
-                       $form .= Xml::inputLabel( wfMsg( 'export-pagelinks' ), 'pagelink-depth', 'pagelink-depth', 20, 0 ) . '<br />';
+                       $form .= Xml::inputLabel( $this->msg( 'export-pagelinks' )->text(), 'pagelink-depth', 'pagelink-depth', 20, 0 ) . '<br />';
                }
                // Enable this when we can do something useful exporting/importing image information. :)
-               //$form .= Xml::checkLabel( wfMsg( 'export-images' ), 'images', 'wpExportImages', false ) . '<br />';
+               //$form .= Xml::checkLabel( $this->msg( 'export-images' )->text(), 'images', 'wpExportImages', false ) . '<br />';
                $form .= Xml::checkLabel(
-                       wfMsg( 'export-download' ),
+                       $this->msg( 'export-download' )->text(),
                        'wpDownload',
                        'wpDownload',
                        $request->wasPosted() ? $request->getCheck( 'wpDownload' ) : true
@@ -233,14 +233,14 @@ class SpecialExport extends SpecialPage {
 
                if ( $wgExportAllowListContributors ) {
                        $form .= Xml::checkLabel(
-                               wfMsg( 'exportlistauthors' ),
+                               $this->msg( 'exportlistauthors' )->text(),
                                'listauthors',
                                'listauthors',
                                $request->wasPosted() ? $request->getCheck( 'listauthors' ) : false
                        ) . '<br />';
                }
 
-               $form .= Xml::submitButton( wfMsg( 'export-submit' ), Linker::tooltipAndAccesskeyAttribs( 'export' ) );
+               $form .= Xml::submitButton( $this->msg( 'export-submit' )->text(), Linker::tooltipAndAccesskeyAttribs( 'export' ) );
                $form .= Xml::closeElement( 'form' );
 
                $out->addHTML( $form );