http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100331
Revision: 100331
Author: raymond
Date: 2011-10-20 07:36:22 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
* (bug 25306) Add link of old page title to MediaWiki:Delete_and_move_reason
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/specials/SpecialMovepage.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/languages/messages/MessagesQqq.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-10-20 06:39:53 UTC (rev 100330)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-10-20 07:36:22 UTC (rev 100331)
@@ -71,6 +71,7 @@
* 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
Modified: trunk/phase3/includes/specials/SpecialMovepage.php
===================================================================
--- trunk/phase3/includes/specials/SpecialMovepage.php 2011-10-20 06:39:53 UTC
(rev 100330)
+++ trunk/phase3/includes/specials/SpecialMovepage.php 2011-10-20 07:36:22 UTC
(rev 100331)
@@ -377,11 +377,11 @@
// 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
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-10-20 06:39:53 UTC
(rev 100330)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-10-20 07:36:22 UTC
(rev 100331)
@@ -3244,7 +3244,7 @@
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"',
Modified: trunk/phase3/languages/messages/MessagesQqq.php
===================================================================
--- trunk/phase3/languages/messages/MessagesQqq.php 2011-10-20 06:39:53 UTC
(rev 100330)
+++ trunk/phase3/languages/messages/MessagesQqq.php 2011-10-20 07:36:22 UTC
(rev 100331)
@@ -2882,6 +2882,8 @@
'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.",
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
