r47310 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r47309‎ | r47310 | r47311 >
Date:08:51, 16 February 2009
Author:raymond
Status:resolved (Comments)
Tags:
Comment:
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'
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/ImagePage.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -1250,7 +1250,6 @@
12511251 'noimage',
12521252 'noimage-linktext',
12531253 'uploadnewversion-linktext',
1254 - 'imagepage-searchdupe',
12551254 ),
12561255 'filerevert' => array(
12571256 'filerevert',
Index: trunk/phase3/includes/ImagePage.php
@@ -577,10 +577,6 @@
578578 $wgOut->addHTML( "<li><div class='plainlinks'>{$ulink}</div></li>" );
579579 }
580580
581 - # Link to Special:FileDuplicateSearch
582 - $dupeLink = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'FileDuplicateSearch', $this->mTitle->getDBkey() ), wfMsgHtml( 'imagepage-searchdupe' ) );
583 - $wgOut->addHTML( "<li>{$dupeLink}</li>" );
584 -
585581 # External editing link
586582 $elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' );
587583 $wgOut->addHTML( '<li>' . $elink . ' <small>' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . '</small></li>' );
@@ -694,7 +690,7 @@
695691
696692 $wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
697693 $wgOut->addWikiMsg( 'duplicatesoffile',
698 - $wgLang->formatNum( count( $dupes ) )
 694+ $wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey()
699695 );
700696 $wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
701697
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -1980,7 +1980,7 @@
19811981 'nolinkstoimage' => 'There are no pages that link to this file.',
19821982 'morelinkstoimage' => 'View [[Special:WhatLinksHere/$1|more links]] to this file.',
19831983 'redirectstofile' => 'The following {{PLURAL:$1|file redirects|$1 files redirect}} to this file:',
1984 -'duplicatesoffile' => 'The following {{PLURAL:$1|file is a duplicate|$1 files are duplicates}} of this file:',
 1984+'duplicatesoffile' => 'The following {{PLURAL:$1|file is a duplicate|$1 files are duplicates}} of this file ([[Special:FileDuplicateSearch/$2|more details]]):',
19851985 'sharedupload' => 'This file is a shared upload and may be used by other projects.',
19861986 'shareduploadwiki' => 'Please see the $1 for further information.',
19871987 'shareduploadwiki-desc' => 'The description on its $1 on the shared repository is shown below.',
@@ -1993,7 +1993,6 @@
19941994 'noimage' => 'No file by this name exists, but you can $1.',
19951995 'noimage-linktext' => 'upload one',
19961996 'uploadnewversion-linktext' => 'Upload a new version of this file',
1997 -'imagepage-searchdupe' => 'Search for duplicate files',
19981997
19991998 # File reversion
20001999 'filerevert' => 'Revert $1',
Index: trunk/phase3/RELEASE-NOTES
@@ -103,6 +103,9 @@
104104 * Wrap warning message 'editinginterface' into a div with class
105105 'mw-editinginterface'
106106 * (bug 17497) Oasis opendocument added to mime.types
 107+* Remove the link to Special:FileDuplicateSearch from the "file history" section
 108+ of image description pages as the list of duplicated files is shown in the
 109+ next section anyway.
107110
108111 === Bug fixes in 1.15 ===
109112 * (bug 16968) Special:Upload no longer throws useless warnings.

Comments

#Comment by Brion VIBBER (talk | contribs)   21:00, 17 February 2009

There's still some duplication in the dupe info links:

Funky dupe markings.png

#Comment by Aaron Schulz (talk | contribs)   22:31, 17 February 2009

Fixed in r47381

Status & tagging log