From 039e23c42368a5ca114846a8b4aff759b9235de2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 7 Mar 2008 10:35:19 +0000
Subject: [PATCH] * Let's remove hardcoding together

---
 includes/SpecialUpload.php        | 19 +++++++++----------
 languages/messages/MessagesEn.php | 10 +++++-----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 98a41f2fb7..8f3a37a6a5 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -999,8 +999,8 @@ wgAjaxLicensePreview = {$alp};
 			}
 		}
 
-		$sourcefilename = wfMsgHtml( 'sourcefilename' );
-		$destfilename = wfMsgHtml( 'destfilename' );
+		$sourcefilename = wfMsgExt( 'sourcefilename', 'escapenoentities' );
+		$destfilename = wfMsgExt( 'destfilename', 'escapenoentities' );
 		$summary = wfMsgExt( 'fileuploadsummary', 'parseinline' );
 
 		$licenses = new Licenses();
@@ -1060,20 +1060,19 @@ wgAjaxLicensePreview = {$alp};
 		$encComment = htmlspecialchars( $this->mComment );
 		$align1 = $wgContLang->isRTL() ? 'left' : 'right';
 		$align2 = $wgContLang->isRTL() ? 'right' : 'left';
-		$colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 
 		$wgOut->addHTML( <<<EOT
 	<form id='upload' method='post' enctype='multipart/form-data' action="$action">
 		<table border='0'>
 		<tr>
 			{$this->uploadFormTextTop}
-			<td align='$align1' valign='top'><label for='wpUploadFile'>{$sourcefilename}$colon</label></td>
+			<td align='$align1' valign='top'><label for='wpUploadFile'>{$sourcefilename}</label></td>
 			<td align='$align2'>
 				{$filename_form}
 			</td>
 		</tr>
 		<tr>
-			<td align='$align1'><label for='wpDestFile'>{$destfilename}$colon</label></td>
+			<td align='$align1'><label for='wpDestFile'>{$destfilename}</label></td>
 			<td align='$align2'>
 				<input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60' 
 					value="$encDestName" $destOnkeyup />
@@ -1094,7 +1093,7 @@ EOT
 		if ( $licenseshtml != '' ) {
 			global $wgStylePath;
 			$wgOut->addHTML( "
-			<td align='$align1'><label for='wpLicense'>$license$colon</label></td>
+			<td align='$align1'><label for='wpLicense'>$license</label></td>
 			<td align='$align2'>
 				<select name='wpLicense' id='wpLicense' tabindex='4'
 					onchange='licenseSelectorCheck()'>
@@ -1114,18 +1113,18 @@ EOT
 		}
 
 		if ( $wgUseCopyrightUpload ) {
-			$filestatus = wfMsgHtml ( 'filestatus' );
+			$filestatus = wfMsgExt( 'filestatus', 'escapenoentities' );
 			$copystatus =  htmlspecialchars( $this->mCopyrightStatus );
-			$filesource = wfMsgHtml ( 'filesource' );
+			$filesource = wfMsgExt( 'filesource', 'escapenoentities' );
 			$uploadsource = htmlspecialchars( $this->mCopyrightSource );
 
 			$wgOut->addHTML( "
-				<td align='$align1' nowrap='nowrap'><label for='wpUploadCopyStatus'>$filestatus$colon</label></td>
+				<td align='$align1' nowrap='nowrap'><label for='wpUploadCopyStatus'>$filestatus</label></td>
 					<td><input tabindex='5' type='text' name='wpUploadCopyStatus' id='wpUploadCopyStatus' 
 					  value=\"$copystatus\" size='60' /></td>
 			</tr>
 			<tr>
-				<td align='$align1'><label for='wpUploadCopyStatus'>$filesource$colon</label></td>
+				<td align='$align1'><label for='wpUploadCopyStatus'>$filesource</label></td>
 					<td><input tabindex='6' type='text' name='wpUploadSource' id='wpUploadCopyStatus' 
 					  value=\"$uploadsource\" size='60' /></td>
 			</tr>
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 8a0b25a69f..6a3728fc35 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1412,8 +1412,8 @@ To include a file in a page, use a link in the form
 'filename'                    => 'Filename',
 'filedesc'                    => 'Summary',
 'fileuploadsummary'           => 'Summary:',
-'filestatus'                  => 'Copyright status',
-'filesource'                  => 'Source',
+'filestatus'                  => 'Copyright status:',
+'filesource'                  => 'Source:',
 'uploadedfiles'               => 'Uploaded files',
 'ignorewarning'               => 'Ignore warning and save file anyway.',
 'ignorewarnings'              => 'Ignore any warnings',
@@ -1450,8 +1450,8 @@ If you have this image in full resolution upload this one, otherwise change the
 'uploadscripted'              => 'This file contains HTML or script code that may be erroneously interpreted by a web browser.',
 'uploadcorrupt'               => 'The file is corrupt or has an incorrect extension. Please check the file and upload again.',
 'uploadvirus'                 => 'The file contains a virus! Details: $1',
-'sourcefilename'              => 'Source filename',
-'destfilename'                => 'Destination filename',
+'sourcefilename'              => 'Source filename:',
+'destfilename'                => 'Destination filename:',
 'watchthisupload'             => 'Watch this page',
 'filewasdeleted'              => 'A file of this name has been previously uploaded and subsequently deleted. You should check the $1 before proceeding to upload it again.',
 'upload-wasdeleted'           => "'''Warning: You are uploading a file that was previously deleted.'''
@@ -1487,7 +1487,7 @@ PICT # misc.
 'upload-curl-error28'      => 'Upload timeout',
 'upload-curl-error28-text' => 'The site took too long to respond. Please check the site is up, wait a short while and try again. You may want to try at a less busy time.',
 
-'license'            => 'Licensing',
+'license'            => 'Licensing:',
 'nolicense'          => 'None selected',
 'licenses'           => '-', # don't translate or duplicate this message to other languages
 'license-nopreview'  => '(Preview not available)',
-- 
2.20.1