From: Florian <florian.schmidt.welzow@t-online.de>
Date: Fri, 8 Jan 2016 06:27:46 +0000 (+0100)
Subject: SpecialExpandTemplates: Fix false checkbox label for nowiki tag
X-Git-Tag: 1.31.0-rc.0~8378^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=32899385ac660da5b69dd9c8ecc2690b70fe19a6;p=lhc%2Fweb%2Fwiklou.git

SpecialExpandTemplates: Fix false checkbox label for nowiki tag

Bug: T122907
Change-Id: I49f4209f2e91e08ad08ba79ab3f76a0cf0dbea02
---

diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php
index 14d86755e4..00f6609826 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -168,35 +168,35 @@ class SpecialExpandTemplates extends SpecialPage {
 			'input' => array(
 				'type' => 'textarea',
 				'name' => 'wpInput',
-				'label-message' => 'expand_templates_input',
+				'label' => $this->msg( 'expand_templates_input' )->text(),
 				'rows' => 10,
 				'default' => $input,
 				'id' => 'input',
 			),
 			'removecomments' => array(
 				'type' => 'check',
-				'label-message' => 'expand_templates_remove_comments',
+				'label' => $this->msg( 'expand_templates_remove_comments' )->text(),
 				'name' => 'wpRemoveComments',
 				'id' => 'removecomments',
 				'default' => $this->removeComments,
 			),
 			'removenowiki' => array(
 				'type' => 'check',
-				'label-message' => 'expand_templates_remove_nowiki',
+				'label' => $this->msg( 'expand_templates_remove_nowiki' )->text(),
 				'name' => 'wpRemoveNowiki',
 				'id' => 'removenowiki',
 				'default' => $this->removeNowiki,
 			),
 			'generate_xml' => array(
 				'type' => 'check',
-				'label-message' => 'expand_templates_generate_xml',
+				'label' => $this->msg( 'expand_templates_generate_xml' )->text(),
 				'name' => 'wpGenerateXml',
 				'id' => 'generate_xml',
 				'default' => $this->generateXML,
 			),
 			'generate_rawhtml' => array(
 				'type' => 'check',
-				'label-message' => 'expand_templates_generate_rawhtml',
+				'label' => $this->msg( 'expand_templates_generate_rawhtml' )->text(),
 				'name' => 'wpGenerateRawHtml',
 				'id' => 'generate_rawhtml',
 				'default' => $this->generateRawHtml,