Merge "SpecialUnusedimages: Change message when CountCategorizedImagesAsUsed"

[lhc/web/wiklou.git] / includes / specials / SpecialImport.php

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 153b7d1..a985bcc 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -179,8 +179,9 @@ class SpecialImport extends SpecialPage {
 
                $out = $this->getOutput();
                if ( !$source->isGood() ) {
-                       $out->addWikiText( "<div class=\"error\">\n" .
-                               $this->msg( 'importfailed', $source->getWikiText() )->parse() . "\n</div>" );
+                       $out->wrapWikiTextAsInterface( 'error',
+                               $this->msg( 'importfailed', $source->getWikiText() )->plain()
+                       );
                } else {
                        $importer = new WikiImporter( $source->value, $this->getConfig() );
                        if ( !is_null( $this->namespace ) ) {
@@ -279,6 +280,7 @@ class SpecialImport extends SpecialPage {
                                                        'selected' => ( $isSameSourceAsBefore ?
                                                                $this->namespace :
                                                                ( $defaultNamespace || '' ) ),
+                                                       'in-user-lang' => true,
                                                ], [
                                                        'name' => "namespace",
                                                        // mw-import-namespace-interwiki, mw-import-namespace-upload