From: Amir E. Aharoni Date: Thu, 22 Mar 2012 00:32:24 +0000 (+0200) Subject: (bug 33928) make diff title page more relevant X-Git-Tag: 1.31.0-rc.0~23645^2 X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=6564620d2ad94ac502ea3b5a45951173e11cca05;p=lhc%2Fweb%2Fwiklou.git (bug 33928) make diff title page more relevant Original patch by Nischay Nahata. Patchset2: amended commit message to be shorter and clearer. Patchset3: use wfMessage()->text() instead of default parse() Patchset4: remove unneeded tabs. Patchset5: added git difference-title to maintenance/language/messages.inc . Patchset6: moved OutputPage::setPageTitle() calls to DifferenceEngine and added difference-title-multipage message Patchset7: Fixed an error in messages.inc from the last changeset Patchset8: Removed the diff page subtitle according to Brion's suggestions. Note: I am doing this almost a month since committing the original patch. Rebasing proved to be too tricky, so I tried to cherry-pick the original commit in a new branch. Apparently, Git identified it. If this works as planned, it must be a miracle. Patchset9: removes unneeded changes to message files Change-Id: I4e6363529a1e77a3f5267ec6871e8dea0354f043 --- diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index e8f35f0d0a..182416eab4 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -239,8 +239,7 @@ class DifferenceEngine extends ContextSource { # a diff between a version V and its previous version V' AND the version V # is the first version of that article. In that case, V' does not exist. if ( $this->mOldRev === false ) { - $out->setPageTitle( $this->mNewPage->getPrefixedText() ); - $out->addSubtitle( $this->msg( 'difference' ) ); + $out->setPageTitle( $this->msg( 'difference-title', $this->mNewPage->getPrefixedText() ) ); $samePage = true; $oldHeader = ''; } else { @@ -252,11 +251,11 @@ class DifferenceEngine extends ContextSource { } if ( $this->mNewPage->equals( $this->mOldPage ) ) { - $out->setPageTitle( $this->mNewPage->getPrefixedText() ); - $out->addSubtitle( $this->msg( 'difference' ) ); + $out->setPageTitle( $this->msg( 'difference-title', $this->mNewPage->getPrefixedText() ) ); $samePage = true; } else { - $out->setPageTitle( $this->mOldPage->getPrefixedText() . ', ' . $this->mNewPage->getPrefixedText() ); + $out->setPageTitle( $this->msg( 'difference-title-multipage', $this->mOldPage->getPrefixedText(), + $this->mNewPage->getPrefixedText() ) ); $out->addSubtitle( $this->msg( 'difference-multipage' ) ); $samePage = false; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index bb080780fd..c69ab8de59 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1665,15 +1665,16 @@ Note that using the navigation links will reset this column.', 'mergelogpagetext' => 'Below is a list of the most recent merges of one page history into another.', # Diffs -'history-title' => 'Revision history of "$1"', -'difference' => '(Difference between revisions)', -'difference-multipage' => '(Difference between pages)', -'lineno' => 'Line $1:', -'compareselectedversions' => 'Compare selected revisions', -'showhideselectedversions' => 'Show/hide selected revisions', -'editundo' => 'undo', -'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by {{PLURAL:$2|one user|$2 users}} not shown)', -'diff-multi-manyusers' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by more than $2 {{PLURAL:$2|user|users}} not shown)', +'history-title' => 'Revision history of "$1"', +'difference-title' => 'Difference between revisions of "$1"', +'difference-title-multipage' => 'Difference between pages "$1" and "$2"', +'difference-multipage' => '(Difference between pages)', +'lineno' => 'Line $1:', +'compareselectedversions' => 'Compare selected revisions', +'showhideselectedversions' => 'Show/hide selected revisions', +'editundo' => 'undo', +'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by {{PLURAL:$2|one user|$2 users}} not shown)', +'diff-multi-manyusers' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by more than $2 {{PLURAL:$2|user|users}} not shown)', # Search results 'search-summary' => '', # do not translate or duplicate this message to other languages diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index e8e3df1fca..87252c59db 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -1237,7 +1237,8 @@ Please note that the parameters in a log entry will appear in the log only in th # Diffs 'history-title' => 'Displayed as page title when you click on the "history" tab. The parameter $1 is the normal page title.', -'difference' => 'Displayed under the title when viewing the difference between two or more edits.', +'difference-title' => 'Displayed as page title when viewing the difference between two edits of the same page. The parameter $1 is the page title of the two revisions.', +'difference-title-multipage' => 'Displayed as page title when viewing the difference between two edits of different pages. The parameter $1 is the page title of the old revision and $2 is the page title of the new revision.', 'difference-multipage' => 'Displayed under the title when viewing the difference between two or more pages. See also {{msg-mw|difference}}.', 'lineno' => 'Message used when comparing different versions of a page (diff). $1 is a line number.', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index d22449b8c3..a7259d6fd1 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -838,7 +838,8 @@ $wgMessageStructure = array( ), 'diffs' => array( 'history-title', - 'difference', + 'difference-title', + 'difference-title-multipage', 'difference-multipage', 'lineno', 'compareselectedversions',