* (bug 10677) Add link to the file description page on the shared repository

The existing message 'sharedupload' does not has a link to the shared repository. A lot of WMF projects has modified it locally but for their content language only.
That means, all users with another user language does not profit from the modification.
Compare http://en.wikipedia.org/wiki/Image:test.jpg?uselang=en and http://en.wikipedia.org/wiki/Image:test.jpg?uselang=eo
New message 'shareduploadwiki-desc' introduced. This can be set to '-' by local sysops to suppress the message if 'sharedupload' has a link already.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6963c66..800f8da 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -396,6 +396,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   LTR user language
 * (bug 13005) DISPLAYTITLE does not work on preview
 * (bug 13004) Fix error on Postgres searches that return too many results.
+* (bug 10677) Add link to the file description page on the shared repository
 
 == Parser changes in 1.12 ==
 

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 573bc4d..a39da0a 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -346,19 +346,27 @@ EOT
                }
        }
 
+       /**
+        * Show a notice that the file is from a shared repository
+        */
        function printSharedImageText() {
                global $wgOut, $wgUser;
 
                $descUrl = $this->img->getDescriptionUrl();
                $descText = $this->img->getDescriptionText();
-               $s = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml("sharedupload");
-               if ( $descUrl && !$descText) {
+               $s = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml( 'sharedupload' );
+               if ( $descUrl ) {
                        $sk = $wgUser->getSkin();
-                       $link = $sk->makeExternalLink( $descUrl, wfMsg('shareduploadwiki-linktext') );
-                       $s .= " " . wfMsgWikiHtml('shareduploadwiki', $link);
+                       $link = $sk->makeExternalLink( $descUrl, wfMsg( 'shareduploadwiki-linktext' ) );
+                       $msg = ( $descText ) ? 'shareduploadwiki-desc' : 'shareduploadwiki';
+                       $msg = wfMsgExt( $msg, array( 'parseinline', 'replaceafter' ), $link );
+                       if ( $msg != '-' ) {
+                               # Show message only if not voided by local sysops
+                               $s .= $msg;
+                       }
                }
                $s .= "</div>";
-               $wgOut->addHTML($s);
+               $wgOut->addHTML( $s );
 
                if ( $descText ) {
                        $this->mExtraDescription = $descText;

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 7669315..bd58388 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1189,7 +1189,8 @@ Bitte gib der Datei einen Namen, der den Inhalt besser beschreibt.',
 'linkstoimage'              => 'Die folgenden Seiten benutzen diese Datei:',
 'nolinkstoimage'            => 'Keine Seite benutzt diese Datei.',
 'sharedupload'              => 'Diese Datei ist ein gemeinsam genutzter Upload und kann von anderen Projekten verwendet werden.',
-'shareduploadwiki'          => 'Für weitere Informationen siehe $1.',
+'shareduploadwiki'          => 'Für weitere Informationen siehe die $1.',
+'shareduploadwiki-desc'     => 'Es folgt der Inhalt der $1.',
 'shareduploadwiki-linktext' => 'Datei-Beschreibungsseite',
 'noimage'                   => 'Eine Datei mit diesem Namen existiert nicht, du kannst sie jedoch $1.',
 'noimage-linktext'          => 'hochladen',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index da79467..574cdcb 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1513,6 +1513,7 @@ PICT # misc.
 'nolinkstoimage'            => 'There are no pages that link to this file.',
 '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 there is shown below.',
 'shareduploadwiki-linktext' => 'file description page',
 'shareddescriptionfollows'  => '-', # don't translate or duplicate this message to other languages
 'noimage'                   => 'No file by this name exists, you can $1.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 19bd600..50d7531 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -929,6 +929,7 @@ $wgMessageStructure = array(
                'nolinkstoimage',
                'sharedupload',
                'shareduploadwiki',
+               'shareduploadwiki-desc',
                'shareduploadwiki-linktext',
                'shareddescriptionfollows',
                'noimage',