From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Thu, 20 Oct 2011 07:36:22 +0000 (+0000)
Subject: * (bug 25306) Add link of old page title to MediaWiki:Delete_and_move_reason
X-Git-Tag: 1.31.0-rc.0~26988
X-Git-Url: http://git.cyclocoop.org/data/modifier.php?a=commitdiff_plain;h=7414b487f56434b9971543170d46b8a78785ecc8;p=lhc%2Fweb%2Fwiklou.git

* (bug 25306) Add link of old page title to MediaWiki:Delete_and_move_reason
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index e8892141ca..33d6346e3f 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -71,6 +71,7 @@ production.
 * Some deprecated presentational html attributes will now be automatically converted to css.
 * (bug 31297) Add support for namespaces in Special:RecentChanges subpage filter syntax.
 * The default user signature now contains a talk link in addition to the user link.
+* (bug 25306) Add link of old page title to MediaWiki:Delete_and_move_reason
 
 === Bug fixes in 1.19 ===
 * $wgUploadNavigationUrl should be used for file redlinks if
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index f8bb2f7120..cc4c61c90c 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -377,11 +377,11 @@ class MovePageForm extends UnlistedSpecialPage {
 			// Delete an associated image if there is
 			$file = wfLocalFile( $nt );
 			if( $file->exists() ) {
-				$file->delete( wfMsgForContent( 'delete_and_move_reason' ), false );
+				$file->delete( wfMessage( 'delete_and_move_reason', $ot )->inContentLanguage()->text(), false );
 			}
 
 			// This may output an error message and exit
-			$article->doDelete( wfMsgForContent( 'delete_and_move_reason' ) );
+			$article->doDelete(wfMessage( 'delete_and_move_reason', $ot )->inContentLanguage()->text() );
 		}
 
 		# don't allow moving to pages with # in
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a69dfac39a..e284574b14 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3244,7 +3244,7 @@ Please merge them manually.'''",
 The destination page "[[:$1]]" already exists.
 Do 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',
+'delete_and_move_reason'       => 'Deleted to make way for move from "[[$1]]"',
 'selfmove'                     => 'Source and destination titles are the same;
 cannot move a page over itself.',
 'immobile-source-namespace'    => 'Cannot move pages in namespace "$1"',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 2895bf2b93..43eda21b0e 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2882,6 +2882,8 @@ Parameters:
 'revertmove'                   => '{{Identical|Revert}}',
 'delete_and_move_text'         => 'Used when moving a page, but the destination page already exists and needs deletion. This message is to confirm that you really want to delete the page. See also {{msg|delete and move confirm}}.',
 'delete_and_move_confirm'      => 'Used when moving a page, but the destination page already exists and needs deletion. This message is for a checkbox to confirm that you really want to delete the page. See also {{msg|delete and move text}}.',
+'delete_and_move_reason'       => 'Shown as reason in content language in the deletion log. Parameter:
+* $1: The page name for which this page was deleted.',
 'immobile-target-namespace-iw' => "This message appears when attempting to move a page, if a person has typed an interwiki link as a namespace prefix in the input box labelled 'To new title'.  The special page 'Movepage' cannot be used to move a page to another wiki.
 
 'Destination' can be used instead of 'target' in this message.",