From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 23 Aug 2017 21:17:53 +0000 (+0200)
Subject: SpecialPageLanguage: Show current page language in the dropdown
X-Git-Tag: 1.31.0-rc.0~2300^2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=88223152a00ff678c1cc0876fe221c3636bbf8bc

SpecialPageLanguage: Show current page language in the dropdown

Also show canonical page title form while we're at it.

Bug: T74966
Change-Id: I52c19a0a018d76a4282c61c009b40b2f7e56b3d2
---

diff --git a/includes/specials/SpecialPageLanguage.php b/includes/specials/SpecialPageLanguage.php
index 78a453e7b1..a68f08fd9a 100644
--- a/includes/specials/SpecialPageLanguage.php
+++ b/includes/specials/SpecialPageLanguage.php
@@ -49,12 +49,20 @@ class SpecialPageLanguage extends FormSpecialPage {
 	protected function getFormFields() {
 		// Get default from the subpage of Special page
 		$defaultName = $this->par;
+		$title = $defaultName ? Title::newFromText( $defaultName ) : null;
+		if ( $title ) {
+			$defaultPageLanguage =
+				ContentHandler::getForTitle( $title )->getPageLanguage( $title );
+			$hasCustomLanguageSet = !$defaultPageLanguage->equals( $title->getPageLanguage() );
+		} else {
+			$hasCustomLanguageSet = false;
+		}
 
 		$page = [];
 		$page['pagename'] = [
 			'type' => 'title',
 			'label-message' => 'pagelang-name',
-			'default' => $defaultName,
+			'default' => $title ? $title->getPrefixedText() : $defaultName,
 			'autofocus' => $defaultName === null,
 			'exists' => true,
 		];
@@ -68,7 +76,7 @@ class SpecialPageLanguage extends FormSpecialPage {
 			'id' => 'mw-pl-options',
 			'type' => 'radio',
 			'options' => $selectoptions,
-			'default' => 1
+			'default' => $hasCustomLanguageSet ? 2 : 1
 		];
 
 		// Building a language selector
@@ -86,7 +94,9 @@ class SpecialPageLanguage extends FormSpecialPage {
 			'type' => 'select',
 			'options' => $options,
 			'label-message' => 'pagelang-language',
-			'default' => $this->getConfig()->get( 'LanguageCode' ),
+			'default' => $title ?
+				$title->getPageLanguage()->getCode() :
+				$this->getConfig()->get( 'LanguageCode' ),
 		];
 
 		// Allow user to enter a comment explaining the change