| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1878,6 +1878,7 @@ |
| 1879 | 1879 | 'movepagebtn', |
| 1880 | 1880 | 'pagemovedsub', |
| 1881 | 1881 | 'movepage-moved', |
| | 1882 | + 'movepage-moved-noredirect', |
| 1882 | 1883 | 'articleexists', |
| 1883 | 1884 | 'cantmove-titleprotected', |
| 1884 | 1885 | 'talkexists', |
| — | — | @@ -3088,6 +3089,7 @@ |
| 3089 | 3090 | 'exif-orientation-7' => '0th row: right; 0th column: bottom', |
| 3090 | 3091 | 'exif-orientation-8' => '0th row: left; 0th column: bottom', |
| 3091 | 3092 | 'movepage-moved' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.', |
| | 3093 | + 'movepage-moved-noredirect' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.', |
| 3092 | 3094 | 'ipboptions' => 'display1:time1,display2:time2,...', |
| 3093 | 3095 | 'protect-expiry-options' => 'display1:time1,display2:time2,...', |
| 3094 | 3096 | 'metadata-fields' => 'Do not translate list items', |
| Index: trunk/phase3/includes/specials/SpecialMovepage.php |
| — | — | @@ -168,8 +168,7 @@ |
| 169 | 169 | |
| 170 | 170 | $wgOut->addHTML( |
| 171 | 171 | Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ), 'id' => 'movepage' ) ) . |
| 172 | | - Xml::openElement( 'fieldset' ) . |
| 173 | | - Xml::element( 'legend', null, wfMsg( 'move-page-legend' ) ) . |
| | 172 | + Xml::fieldset( wfMsg( 'move-page-legend' ) ) . |
| 174 | 173 | Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-movepage-table' ) ) . |
| 175 | 174 | "<tr> |
| 176 | 175 | <td class='mw-label'>" . |
| — | — | @@ -349,7 +348,8 @@ |
| 350 | 349 | $oldLink = "<span class='plainlinks'>[$oldUrl $oldText]</span>"; |
| 351 | 350 | $newLink = "<span class='plainlinks'>[$newUrl $newText]</span>"; |
| 352 | 351 | |
| 353 | | - $wgOut->addWikiMsg( 'movepage-moved', $oldLink, $newLink, $oldText, $newText ); |
| | 352 | + $msgName = $createRedirect ? 'movepage-moved' : 'movepage-moved-noredirect'; |
| | 353 | + $wgOut->addWikiMsg( $msgName, $oldLink, $newLink, $oldText, $newText ); |
| 354 | 354 | |
| 355 | 355 | # Now we move extra pages we've been asked to move: subpages and talk |
| 356 | 356 | # pages. First, if the old page or the new page is a talk page, we |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2699,7 +2699,12 @@ |
| 2700 | 2700 | 'move-watch' => 'Watch this page', |
| 2701 | 2701 | 'movepagebtn' => 'Move page', |
| 2702 | 2702 | 'pagemovedsub' => 'Move succeeded', |
| 2703 | | -'movepage-moved' => '<big>\'\'\'"$1" has been moved to "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message. |
| | 2703 | +'movepage-moved' => '<big>\'\'\'"$1" has been moved to "$2"\'\'\'</big> |
| | 2704 | + |
| | 2705 | +A redirect has been created.', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message. |
| | 2706 | +'movepage-moved-noredirect' => '<big>\'\'\'"$1" has been moved to "$2"\'\'\'</big> |
| | 2707 | + |
| | 2708 | +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. |
| 2704 | 2709 | 'articleexists' => 'A page of that name already exists, or the name you have chosen is not valid. |
| 2705 | 2710 | Please choose another name.', |
| 2706 | 2711 | 'cantmove-titleprotected' => 'You cannot move a page to this location, because the new title has been protected from creation', |