From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 20 Aug 2005 17:59:40 +0000 (+0000)
Subject: bug 3208: split the other meaning of filedesc to fileuploadsummary, which is wikitext
X-Git-Tag: 1.6.0~1860
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=181c090f28795ed23de414ecb67ace7f768dee74;p=lhc%2Fweb%2Fwiklou.git

bug 3208: split the other meaning of filedesc to fileuploadsummary, which is wikitext
---

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 15175d1d97..e8f371ede6 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -530,7 +530,7 @@ class UploadForm {
 		$sourcefilename = wfMsgHtml( 'sourcefilename' );
 		$destfilename = wfMsgHtml( 'destfilename' );
 		
-		$fd = wfMsgHtml( 'filedesc' );
+		$summary = wfMsgWikiHtml( 'fileuploadsummary' );
 		$ulb = wfMsgHtml( 'uploadbtn' );
 
 
@@ -565,7 +565,7 @@ class UploadForm {
 	<input tabindex='1' type='text' name='wpDestFile' id='wpDestFile' size='40' value=\"$encDestFile\" />
 	</td></tr><tr>
 	
-	<td align='right'>{$fd}:</td><td align='left'>
+	<td align='right'>{$summary}</td><td align='left'>
 	<textarea tabindex='2' name='wpUploadDescription' rows='6' cols='{$cols}'{$ew}>"	
 	  . htmlspecialchars( $this->mUploadDescription ) .
 	"</textarea>
diff --git a/languages/Language.php b/languages/Language.php
index 6041ab1786..bff57b136c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1012,6 +1012,7 @@ To include the image in a page, use a link in the form
 'uploadlogpagetext' => 'Below is a list of the most recent file uploads.',
 'filename'		=> 'Filename',
 'filedesc'		=> 'Summary',
+'fileuploadsummary' => 'Summary:',
 'filestatus' => 'Copyright status',
 'filesource' => 'Source',
 'copyrightpage' => "Project:Copyrights",