From 2b23eba0ef95555d001ac757d84e55f309dc43b7 Mon Sep 17 00:00:00 2001 From: River Tarnell Date: Mon, 4 Jul 2005 03:10:20 +0000 Subject: [PATCH] add message before commons desc html, not wikitext --- includes/ImagePage.php | 8 ++++++-- languages/Language.php | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 1105661288..d8c0b8cc12 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -59,8 +59,12 @@ class ImagePage extends Article { $this->viewUpdates(); } - if ($this->mExtraDescription) - $wgOut->addWikiText($this->mExtraDescription); + if ($this->mExtraDescription) { + $fol = wfMsg('shareddescriptionfollows'); + if ($fol != '-') + $wgOut->addWikiText(wfMsg('shareddescriptionfollows')); + $wgOut->addHTML($this->mExtraDescription); + } $this->closeShowImage(); $this->imageHistory(); diff --git a/languages/Language.php b/languages/Language.php index d4bc01b23d..e156374e25 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1063,6 +1063,7 @@ this old version, (rev) = revert to this old version. '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 file description page] for further information.', +'shareddescriptionfollows' => '-', 'noimage' => 'No file by this name exists, you can [$1 upload it]', 'uploadnewversion' => '[$1 Upload a new version of this file]', @@ -2121,7 +2122,7 @@ will expire at $4. # Scary transclusion 'scarytranscludedisabled' => '[Interwiki transcluding is disabled]', -'scarytranscludefailed' => '[Template fetch failed; sorry]', +'scarytranscludefailed' => '[Template fetch failed for $1; sorry]', 'scarytranscludetoolong' => '[URL is too long; sorry]', ); @@ -2429,7 +2430,7 @@ class Language { if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); } $datePreference = $this->dateFormat($format); - + if ($datePreference == '0' || $datePreference == '' ) {$datePreference = $wgAmericanDates ? '0' : '2';} -- 2.20.1