From: Brian Wolff <bawolff+wn@gmail.com>
Date: Fri, 9 Aug 2013 21:45:11 +0000 (-0300)
Subject: Add optional message to define default description for Upload
X-Git-Tag: 1.31.0-rc.0~18765^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=951275e42d72b48429fdcade10ba750834827ebf;p=lhc%2Fweb%2Fwiklou.git

Add optional message to define default description for Upload

Adds message 'upload-default-description' (default to disabled)
that allows people to put in a default preload text for the
upload form (like commons does with js). Message is not displayed
if wpForReUpload url parameter is present (aka they clicked
upload a new version from an image description page). [It will
however be present if someone had manually made a url with
wpUploadDestName filled in with an existing file, but the
wpForReUpload was not present].

Bug: 14116
Change-Id: Ibc13da6114232c6870a8a907e7c4c60fad142353
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 263ec3acf1..985de80f63 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -93,7 +93,6 @@ class SpecialUpload extends SpecialPage {
 		if ( !$this->mDesiredDestName && $request->getFileName( 'wpUploadFile' ) !== null ) {
 			$this->mDesiredDestName = $request->getFileName( 'wpUploadFile' );
 		}
-		$this->mComment = $request->getText( 'wpUploadDescription' );
 		$this->mLicense = $request->getText( 'wpLicense' );
 
 		$this->mDestWarningAck = $request->getText( 'wpDestFileWarningAck' );
@@ -104,6 +103,14 @@ class SpecialUpload extends SpecialPage {
 		$this->mCopyrightSource = $request->getText( 'wpUploadSource' );
 
 		$this->mForReUpload = $request->getBool( 'wpForReUpload' ); // updating a file
+
+		$commentDefault = '';
+		$commentMsg = wfMessage( 'upload-default-description' )->inContentLanguage();
+		if ( !$this->mForReUpload && !$commentMsg->isDisabled() ) {
+			$commentDefault = $commentMsg->plain();
+		}
+		$this->mComment = $request->getText( 'wpUploadDescription', $commentDefault );
+
 		$this->mCancelUpload = $request->getCheck( 'wpCancelUpload' )
 			|| $request->getCheck( 'wpReUpload' ); // b/w compat
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 72ea315d3a..c47d0737be 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2272,6 +2272,7 @@ To include a file in a page, use a link in one of the following forms:
 'upload-preferred'            => 'Preferred file types: $1.',
 'upload-prohibited'           => 'Prohibited file types: $1.',
 'uploadfooter'                => '-', # do not translate or duplicate this message to other languages
+'upload-default-description'  => '-', # do not translate or duplicate this message to other languages
 'uploadlog'                   => 'upload log',
 'uploadlogpage'               => 'Upload log',
 'uploadlogpagetext'           => 'Below is a list of the most recent file uploads.
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index e0bc7ac19b..10a2633e04 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3544,6 +3544,7 @@ See also:
 See also:
 * {{msg-mw|Upload-permitted}}
 * {{msg-mw|Upload-preferred}}',
+'upload-default-description' => 'Do not translate. Default text for the description box on Special:Upload, or "-" to disable.',
 'uploadlogpage' => '{{doc-logpage}}
 
 Page title of [[Special:Log/upload]].',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 0cdc069aa5..c153fa7c4a 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -141,6 +141,7 @@ $wgIgnoredMessages = array(
 	'statistics-footer',
 	'talkpagetext',
 	'uploadfooter',
+	'upload-default-description',
 	'listgrouprights-link',
 	'search-interwiki-custom',
 	'allpages-summary',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index a81df71d94..00d4f1af94 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1385,6 +1385,7 @@ $wgMessageStructure = array(
 		'upload-preferred',
 		'upload-prohibited',
 		'uploadfooter',
+		'upload-default-description',
 		'uploadlog',
 		'uploadlogpage',
 		'uploadlogpagetext',