Merge "Render namespace lists in the user's language"

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

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 836dfcd..5b939ef 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -50,11 +50,7 @@ class SpecialContributions extends IncludableSpecialPage {
                $this->opts = [];
                $request = $this->getRequest();
 
-               if ( $par !== null ) {
-                       $target = $par;
-               } else {
-                       $target = $request->getVal( 'target' );
-               }
+               $target = $par ?? $request->getVal( 'target' );
 
                if ( $request->getVal( 'contribs' ) == 'newbie' || $par === 'newbies' ) {
                        $target = 'newbies';
@@ -611,7 +607,7 @@ class SpecialContributions extends IncludableSpecialPage {
                                ''
                        ) . "\u{00A0}" .
                        Html::namespaceSelector(
-                               [ 'selected' => $this->opts['namespace'], 'all' => '' ],
+                               [ 'selected' => $this->opts['namespace'], 'all' => '', 'in-user-lang' => true ],
                                [
                                        'name' => 'namespace',
                                        'id' => 'namespace',
@@ -710,7 +706,7 @@ class SpecialContributions extends IncludableSpecialPage {
                $dateRangeSelection = Html::rawElement(
                        'div',
                        [],
-                       Xml::label( wfMessage( 'date-range-from' )->text(), 'mw-date-start' ) . ' ' .
+                       Xml::label( $this->msg( 'date-range-from' )->text(), 'mw-date-start' ) . ' ' .
                        new DateInputWidget( [
                                'infusable' => true,
                                'id' => 'mw-date-start',
@@ -718,7 +714,7 @@ class SpecialContributions extends IncludableSpecialPage {
                                'value' => $this->opts['start'],
                                'longDisplayFormat' => true,
                        ] ) . '<br>' .
-                       Xml::label( wfMessage( 'date-range-to' )->text(), 'mw-date-end' ) . ' ' .
+                       Xml::label( $this->msg( 'date-range-to' )->text(), 'mw-date-end' ) . ' ' .
                        new DateInputWidget( [
                                'infusable' => true,
                                'id' => 'mw-date-end',
@@ -748,7 +744,9 @@ class SpecialContributions extends IncludableSpecialPage {
 
                $explain = $this->msg( 'sp-contributions-explain' );
                if ( !$explain->isBlank() ) {
-                       $form .= "<p id='mw-sp-contributions-explain'>{$explain->parse()}</p>";
+                       $form .= Html::rawElement(
+                               'p', [ 'id' => 'mw-sp-contributions-explain' ], $explain->parse()
+                       );
                }
 
                $form .= Xml::closeElement( 'form' );