From 2d9a12546d8b3d0fc0e5b8f732e2f6361904bc17 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 2 Jul 2008 23:47:44 +0000 Subject: [PATCH] Revert r36839 (merge of movepage-moved and movepage-page-moved) -- the two messages have different formats. One is wikitext, the other is plaintext. --- includes/specials/SpecialMovepage.php | 2 +- languages/messages/MessagesEn.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index 4db533b9f3..d08fb66bd8 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -291,7 +291,7 @@ class MovePageForm { $oldLink = "[$oldUrl $oldText]"; $newLink = "[$newUrl $newText]"; - $wgOut->addWikiMsg( 'movepage-page-moved', $oldLink, $newLink, $oldText, $newText ); + $wgOut->addWikiMsg( 'movepage-moved', $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 e7f701b449..ccf307dfe0 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2434,6 +2434,7 @@ 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. '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', @@ -2444,7 +2445,7 @@ Please merge them manually.'''", 'move-subpages' => 'Move all subpages, if applicable', 'move-talk-subpages' => 'Move all subpages of talk page, if applicable', 'movepage-page-exists' => 'The page $1 already exists and cannot be automatically overwritten.', -'movepage-page-moved' => 'The page $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-page-moved' => 'The page $1 has been moved to $2.', 'movepage-page-unmoved' => 'The page $1 could not be moved to $2.', 'movepage-max-pages' => 'The maximum of $1 {{PLURAL:$1|page|pages}} has been moved and no more will be moved automatically.', '1movedto2' => '[[$1]] moved to [[$2]]', -- 2.20.1