| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -481,17 +481,18 @@ |
| 482 | 482 | |
| 483 | 483 | $descUrl = $this->img->getDescriptionUrl(); |
| 484 | 484 | $descText = $this->img->getDescriptionText(); |
| 485 | | - $s = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml( 'sharedupload' ); |
| | 485 | + $msg = ''; |
| 486 | 486 | if( $descUrl ) { |
| 487 | 487 | $sk = $wgUser->getSkin(); |
| 488 | 488 | $link = $sk->makeExternalLink( $descUrl, wfMsg( 'shareduploadwiki-linktext' ) ); |
| 489 | 489 | $msg = ( $descText ) ? 'shareduploadwiki-desc' : 'shareduploadwiki'; |
| 490 | 490 | $msg = wfMsgExt( $msg, array( 'parseinline', 'replaceafter' ), $link ); |
| 491 | | - if( $msg != '-' ) { |
| 492 | | - # Show message only if not voided by local sysops |
| 493 | | - $s .= $msg; |
| | 491 | + if( $msg == '-' ) { |
| | 492 | + $msg = ''; |
| 494 | 493 | } |
| 495 | 494 | } |
| | 495 | + $s = "<div class='sharedUploadNotice'>"; |
| | 496 | + $s .= wfMsgWikiHtml( 'sharedupload', $this->img->getRepo()->getDisplayName(), $msg ); |
| 496 | 497 | $s .= "</div>"; |
| 497 | 498 | $wgOut->addHTML( $s ); |
| 498 | 499 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1969,9 +1969,9 @@ |
| 1970 | 1970 | 'morelinkstoimage' => 'View [[Special:WhatLinksHere/$1|more links]] to this file.', |
| 1971 | 1971 | 'redirectstofile' => 'The following {{PLURAL:$1|file redirects|$1 files redirect}} to this file:', |
| 1972 | 1972 | 'duplicatesoffile' => 'The following {{PLURAL:$1|file is a duplicate|$1 files are duplicates}} of this file ([[Special:FileDuplicateSearch/$2|more details]]):', |
| 1973 | | -'sharedupload' => 'This file is a shared upload and may be used by other projects.', |
| | 1973 | +'sharedupload' => 'This file is from $1 and may be used by other projects. $2', // $1 is the repo name, $2 is shareduploadwiki(-desc) |
| 1974 | 1974 | 'shareduploadwiki' => 'Please see the $1 for further information.', |
| 1975 | | -'shareduploadwiki-desc' => 'The description on its $1 on the shared repository is shown below.', |
| | 1975 | +'shareduploadwiki-desc' => 'The description on its $1 on is shown below.', |
| 1976 | 1976 | 'shareduploadwiki-linktext' => 'file description page', |
| 1977 | 1977 | 'shareddescriptionfollows' => '-', # do not translate or duplicate this message to other languages |
| 1978 | 1978 | 'noimage' => 'No file by this name exists, but you can $1.', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -107,6 +107,9 @@ |
| 108 | 108 | next section anyway. |
| 109 | 109 | * Added $wgRateLimitsExcludedIPs, to allow specific IPs to be whitelisted from |
| 110 | 110 | rate limits. |
| | 111 | +* (bug 14981) Shared repositories can now have display names, located at |
| | 112 | + Mediawiki:Shared-repo-name-REPONAME, where REPONAME is the name in |
| | 113 | + $wgForeignFileRepos |
| 111 | 114 | |
| 112 | 115 | === Bug fixes in 1.15 === |
| 113 | 116 | * (bug 16968) Special:Upload no longer throws useless warnings. |
| — | — | @@ -184,6 +187,8 @@ |
| 185 | 188 | * (bug 17506) Exceptions within exceptions now respect $wgShowExceptionDetails |
| 186 | 189 | * Fixed excessive job queue utilisation |
| 187 | 190 | * File dupe messages for remote repos are now shown only once. |
| | 191 | +* (bug 14980) Messages 'shareduploadwiki' and 'shareduploadwiki-desc' are now |
| | 192 | + used as a parameter in 'sharedupload' for easier styling and customization. |
| 188 | 193 | |
| 189 | 194 | == API changes in 1.15 == |
| 190 | 195 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |