From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Mon, 16 Feb 2009 08:51:38 +0000 (+0000)
Subject: Cleanup image description page a bit:
X-Git-Tag: 1.31.0-rc.0~42880
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=b13fc73642662da98115834508171b5c76696336;p=lhc%2Fweb%2Fwiklou.git

Cleanup image description page a bit:
* Remove the link to Special:FileDuplicateSearch from the "file history" section
  of image description pages as the list of duplicated files is shown in the
  next section anyway.
* Add the link to Special:FileDuplicateSearch to the message 'duplicatesoffile'
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eac9d97742..5bb7bd5923 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -103,6 +103,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Wrap warning message 'editinginterface' into a div with class
   'mw-editinginterface'
 * (bug 17497) Oasis opendocument added to mime.types
+* Remove the link to Special:FileDuplicateSearch from the "file history" section
+  of image description pages as the list of duplicated files is shown in the 
+  next section anyway.
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index fb4fe248fc..1dc6fd6749 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -577,10 +577,6 @@ EOT
 			$wgOut->addHTML( "<li><div class='plainlinks'>{$ulink}</div></li>" );
 		}
 
-		# Link to Special:FileDuplicateSearch
-		$dupeLink = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'FileDuplicateSearch', $this->mTitle->getDBkey() ), wfMsgHtml( 'imagepage-searchdupe' ) );
-		$wgOut->addHTML( "<li>{$dupeLink}</li>" );
-
 		# External editing link
 		$elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' );
 		$wgOut->addHTML( '<li>' . $elink . ' <small>' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . '</small></li>' );
@@ -694,7 +690,7 @@ EOT
 
 		$wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
 		$wgOut->addWikiMsg( 'duplicatesoffile',
-			$wgLang->formatNum( count( $dupes ) )
+			$wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey()
 		);
 		$wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c5bb7bd8b2..f5513e6679 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1980,7 +1980,7 @@ A [[Special:WhatLinksHere/$2|full list]] is available.',
 'nolinkstoimage'                 => 'There are no pages that link to this file.',
 'morelinkstoimage'               => 'View [[Special:WhatLinksHere/$1|more links]] to this file.',
 'redirectstofile'                => 'The following {{PLURAL:$1|file redirects|$1 files redirect}} to this file:',
-'duplicatesoffile'               => 'The following {{PLURAL:$1|file is a duplicate|$1 files are duplicates}} of this file:',
+'duplicatesoffile'               => 'The following {{PLURAL:$1|file is a duplicate|$1 files are duplicates}} of this file ([[Special:FileDuplicateSearch/$2|more details]]):',
 'sharedupload'                   => 'This file is a shared upload and may be used by other projects.',
 'shareduploadwiki'               => 'Please see the $1 for further information.',
 'shareduploadwiki-desc'          => 'The description on its $1 on the shared repository is shown below.',
@@ -1993,7 +1993,6 @@ A [[Special:WhatLinksHere/$2|full list]] is available.',
 'noimage'                        => 'No file by this name exists, but you can $1.',
 'noimage-linktext'               => 'upload one',
 'uploadnewversion-linktext'      => 'Upload a new version of this file',
-'imagepage-searchdupe'           => 'Search for duplicate files',
 
 # File reversion
 'filerevert'                => 'Revert $1',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 0172777e62..7ed875d214 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1250,7 +1250,6 @@ $wgMessageStructure = array(
 		'noimage',
 		'noimage-linktext',
 		'uploadnewversion-linktext',
-		'imagepage-searchdupe',
 	),
 	'filerevert' => array(
 		'filerevert',