From 600d1ebbe06b4557ecf327415fccf4afaf002a6b Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Thu, 1 Jan 2009 15:51:51 +0000 Subject: [PATCH] * Add a new message 'movepage-moved-noredirect' for page moves with suppressed redirects * Tweak 'movepage-moved' a bit (rename of message seems unnecessary) --- includes/specials/SpecialMovepage.php | 6 +++--- languages/messages/MessagesEn.php | 7 ++++++- maintenance/language/messages.inc | 2 ++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index ba7e808bb1..69876ca2be 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -168,8 +168,7 @@ class MovePageForm { $wgOut->addHTML( Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ), 'id' => 'movepage' ) ) . - Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', null, wfMsg( 'move-page-legend' ) ) . + Xml::fieldset( wfMsg( 'move-page-legend' ) ) . Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-movepage-table' ) ) . " " . @@ -349,7 +348,8 @@ class MovePageForm { $oldLink = "[$oldUrl $oldText]"; $newLink = "[$newUrl $newText]"; - $wgOut->addWikiMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText ); + $msgName = $createRedirect ? 'movepage-moved' : 'movepage-moved-noredirect'; + $wgOut->addWikiMsg( $msgName, $oldLink, $newLink, $oldText, $newText ); # Now we move extra pages we've been asked to move: subpages and talk # pages. First, if the old page or the new page is a talk page, we diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index c5d1b1d6fe..1410cc30c8 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2699,7 +2699,12 @@ In those cases, you will have to move or merge the page manually if desired.", 'move-watch' => 'Watch this page', 'movepagebtn' => 'Move page', 'pagemovedsub' => 'Move succeeded', -'movepage-moved' => '\'\'\'"$1" has been moved to "$2"\'\'\'', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message. +'movepage-moved' => '\'\'\'"$1" has been moved to "$2"\'\'\' + +A redirect has been created.', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message. +'movepage-moved-noredirect' => '\'\'\'"$1" has been moved to "$2"\'\'\' + +The creation of a redirect has been suppressed.', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message. 'articleexists' => 'A page of that name already exists, or the name you have chosen is not valid. Please choose another name.', 'cantmove-titleprotected' => 'You cannot move a page to this location, because the new title has been protected from creation', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 90afbb6f74..658eef88da 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1878,6 +1878,7 @@ $wgMessageStructure = array( 'movepagebtn', 'pagemovedsub', 'movepage-moved', + 'movepage-moved-noredirect', 'articleexists', 'cantmove-titleprotected', 'talkexists', @@ -3088,6 +3089,7 @@ $wgMessageComments = array( 'exif-orientation-7' => '0th row: right; 0th column: bottom', 'exif-orientation-8' => '0th row: left; 0th column: bottom', 'movepage-moved' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.', + 'movepage-moved-noredirect' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.', 'ipboptions' => 'display1:time1,display2:time2,...', 'protect-expiry-options' => 'display1:time1,display2:time2,...', 'metadata-fields' => 'Do not translate list items', -- 2.20.1