From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Fri, 27 Nov 2015 01:29:51 +0000 (+0100)
Subject: SpecialMovepage: Don't change button text when moving over existing page
X-Git-Tag: 1.31.0-rc.0~8858
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=adbd9e3c9825ecba68663b6015ff0ef8f72f84bf

SpecialMovepage: Don't change button text when moving over existing page

The button text was being changed from "Move" to "Delete and move". This
is no longer necessary after a confirmation checkbox "Yes, delete the page"
was implemented in ac563af7e7489e701b6b68756fb7b10ed058d07d (r12433).

Change-Id: Ie8e25ab3d11e75f47f4cf1a4ec96407d3f37b547
---

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index fd2f4c7156..e9fb75b23d 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -162,7 +162,6 @@ class MovePageForm extends UnlistedSpecialPage {
 			'movepagetext' :
 			'movepagetext-noredirectfixer'
 		);
-		$movepagebtn = $this->msg( 'movepagebtn' )->text();
 		$submitVar = 'wpMove';
 		$confirm = false;
 
@@ -188,7 +187,6 @@ class MovePageForm extends UnlistedSpecialPage {
 			&& $newTitle->quickUserCan( 'delete', $user )
 		) {
 			$out->addWikiMsg( 'delete_and_move_text', $newTitle->getPrefixedText() );
-			$movepagebtn = $this->msg( 'delete_and_move' )->text();
 			$submitVar = 'wpDeleteAndMove';
 			$confirm = true;
 			$err = array();
@@ -446,8 +444,8 @@ class MovePageForm extends UnlistedSpecialPage {
 		$fields[] = new OOUI\FieldLayout(
 			new OOUI\ButtonInputWidget( array(
 				'name' => $submitVar,
-				'value' => $movepagebtn,
-				'label' => $movepagebtn,
+				'value' => $this->msg( 'movepagebtn' )->text(),
+				'label' => $this->msg( 'movepagebtn' )->text(),
 				'flags' => array( 'constructive', 'primary' ),
 				'type' => 'submit',
 			) ),
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a274facca5..4bec8e216c 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2326,7 +2326,6 @@
 	"move-redirect-text": "",
 	"category-move-redirect-override": "-",
 	"revertmove": "revert",
-	"delete_and_move": "Delete and move",
 	"delete_and_move_text": "== Deletion required ==\nThe destination page \"[[:$1]]\" already exists.\nDo you want to delete it to make way for the move?",
 	"delete_and_move_confirm": "Yes, delete the page",
 	"delete_and_move_reason": "Deleted to make way for move from \"[[$1]]\"",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index bd3776ea31..4c1146efb7 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2500,7 +2500,6 @@
 	"move-redirect-text": "{{ignored}}The text that's added to a redirected page when that redirect is created.",
 	"category-move-redirect-override": "{{ignored}}The text that's added to a redirected category page when that redirect is created.",
 	"revertmove": "{{Identical|Revert}}",
-	"delete_and_move": "Button text on the move page when the target page already exists.",
 	"delete_and_move_text": "Used when moving a page, but the destination page already exists and needs deletion.\n\nThis message is to confirm that you really want to delete the page.\n\nParameters:\n* $1 - the destination page title\n\nSee also:\n* {{msg-mw|Delete and move confirm}}",
 	"delete_and_move_confirm": "Used when moving a page, but the destination page already exists and needs deletion.\n\nThis message is for a checkbox to confirm that you really want to delete the page.\n\nSee also:\n* {{msg-mw|Delete and move text}}",
 	"delete_and_move_reason": "Shown as reason in content language in the deletion log. Parameter:\n* $1 - The page name for which this page was deleted.",