| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -640,7 +640,7 @@ |
| 641 | 641 | ), |
| 642 | 642 | 'diffs' => array( |
| 643 | 643 | 'history-title', |
| 644 | | - 'difference', |
| | 644 | + 'difference-title', |
| 645 | 645 | 'loadingrev', |
| 646 | 646 | 'lineno', |
| 647 | 647 | 'editcurrent', |
| — | — | @@ -803,6 +803,7 @@ |
| 804 | 804 | 'rc_categories_any', |
| 805 | 805 | 'rc-change-size', |
| 806 | 806 | 'newsectionsummary', |
| | 807 | + 'difference', |
| 807 | 808 | ), |
| 808 | 809 | 'recentchangeslinked' => array( |
| 809 | 810 | 'recentchangeslinked', |
| Index: trunk/phase3/includes/DifferenceEngine.php |
| — | — | @@ -72,6 +72,10 @@ |
| 73 | 73 | $this->mRefreshCache = $refreshCache; |
| 74 | 74 | } |
| 75 | 75 | |
| | 76 | + /** |
| | 77 | + * Show difference between revisions |
| | 78 | + * @param $diffOnly bool show the difference only, no preview |
| | 79 | + */ |
| 76 | 80 | function showDiffPage( $diffOnly = false ) { |
| 77 | 81 | global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol; |
| 78 | 82 | $fname = 'DifferenceEngine::showDiffPage'; |
| — | — | @@ -126,6 +130,7 @@ |
| 127 | 131 | # a diff between a version V and its previous version V' AND the version V |
| 128 | 132 | # is the first version of that article. In that case, V' does not exist. |
| 129 | 133 | if ( $this->mOldid === false ) { |
| | 134 | + $wgOut->setPageTitle( wfMsg( 'difference-title', $this->mTitle->getPrefixedText() ) ); |
| 130 | 135 | $this->showFirstRevision(); |
| 131 | 136 | $this->renderNewRevision(); // should we respect $diffOnly here or not? |
| 132 | 137 | wfProfileOut( $fname ); |
| — | — | @@ -137,11 +142,10 @@ |
| 138 | 143 | $oldTitle = $this->mOldPage->getPrefixedText(); |
| 139 | 144 | $newTitle = $this->mNewPage->getPrefixedText(); |
| 140 | 145 | if( $oldTitle == $newTitle ) { |
| 141 | | - $wgOut->setPageTitle( $newTitle ); |
| | 146 | + $wgOut->setPageTitle( wfMsg( 'difference-title', $newTitle ) ); |
| 142 | 147 | } else { |
| 143 | | - $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle ); |
| | 148 | + $wgOut->setPageTitle( wfMsg( 'difference-title', $oldTitle . ', ' . $newTitle ) ); |
| 144 | 149 | } |
| 145 | | - $wgOut->setSubtitle( wfMsg( 'difference' ) ); |
| 146 | 150 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 147 | 151 | |
| 148 | 152 | if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) { |
| — | — | @@ -366,7 +370,6 @@ |
| 367 | 371 | |
| 368 | 372 | $wgOut->addHTML( $header ); |
| 369 | 373 | |
| 370 | | - $wgOut->setSubtitle( wfMsg( 'difference' ) ); |
| 371 | 374 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 372 | 375 | |
| 373 | 376 | wfProfileOut( $fname ); |
| — | — | @@ -2012,6 +2015,3 @@ |
| 2013 | 2016 | wfProfileOut( $fname ); |
| 2014 | 2017 | } |
| 2015 | 2018 | } |
| 2016 | | - |
| 2017 | | - |
| 2018 | | - |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1216,7 +1216,7 @@ |
| 1217 | 1217 | |
| 1218 | 1218 | # Diffs |
| 1219 | 1219 | 'history-title' => 'Revision history of "$1"', |
| 1220 | | -'difference' => '(Difference between revisions)', |
| | 1220 | +'difference-title' => 'Difference between revisions of "$1"', |
| 1221 | 1221 | 'loadingrev' => 'loading revision for diff', |
| 1222 | 1222 | 'lineno' => 'Line $1:', |
| 1223 | 1223 | 'editcurrent' => 'Edit the current version of this page', |
| — | — | @@ -1394,6 +1394,7 @@ |
| 1395 | 1395 | 'rc_categories_any' => 'Any', |
| 1396 | 1396 | 'rc-change-size' => '$1', # only translate this message to other languages if you have to change it |
| 1397 | 1397 | 'newsectionsummary' => '/* $1 */ new section', |
| | 1398 | +'difference' => '(Difference between revisions)', |
| 1398 | 1399 | |
| 1399 | 1400 | # Recent changes linked |
| 1400 | 1401 | 'recentchangeslinked' => 'Related changes', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -877,7 +877,7 @@ |
| 878 | 878 | |
| 879 | 879 | # Diffs |
| 880 | 880 | 'history-title' => 'Versionsgeschichte von „$1“', |
| 881 | | -'difference' => '(Unterschied zwischen Versionen)', |
| | 881 | +'difference-title' => 'Versionsunterschied: „$1“', |
| 882 | 882 | 'loadingrev' => 'Lade Versionen zur Unterscheidung', |
| 883 | 883 | 'lineno' => 'Zeile $1:', |
| 884 | 884 | 'editcurrent' => 'Die aktuelle Version dieser Seite bearbeiten', |
| — | — | @@ -1040,6 +1040,7 @@ |
| 1041 | 1041 | 'rc_categories_any' => 'Alle', |
| 1042 | 1042 | 'rc-change-size' => '$1 {{PLURAL:$1|Byte|Bytes}}', |
| 1043 | 1043 | 'newsectionsummary' => 'Neuer Abschnitt /* $1 */', |
| | 1044 | +'difference' => '(Unterschied zwischen Versionen)', |
| 1044 | 1045 | |
| 1045 | 1046 | # Recent changes linked |
| 1046 | 1047 | 'recentchangeslinked' => 'Änderungen an verlinkten Seiten', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -86,6 +86,7 @@ |
| 87 | 87 | * Show a warning message when creating/editing a user (talk) page but the user |
| 88 | 88 | does not exists |
| 89 | 89 | * (bug 8396) Ignore out-of-date serialised message caches |
| | 90 | +* Add descriptive <title> to revision difference page |
| 90 | 91 | |
| 91 | 92 | === Bug fixes in 1.12 === |
| 92 | 93 | |