From 50c1bb50485fce1a95268d1be9c648a38a9cdd1a Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 27 Jun 2008 13:26:46 +0000
Subject: [PATCH] Localize Virus scanner messages.

---
 includes/specials/SpecialUpload.php   | 7 +++----
 languages/messages/MessagesEn.php     | 5 +++++
 maintenance/language/messageTypes.inc | 3 +++
 maintenance/language/messages.inc     | 4 ++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 81d5b07406..37564cf96a 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1515,9 +1515,8 @@ wgUploadAutoFill = {$autofill};
 
 		if ( !$wgAntivirusSetup[$wgAntivirus] ) {
 			wfDebug( __METHOD__.": unknown virus scanner: $wgAntivirus\n" );
-			# @TODO: localise
-			$wgOut->addHTML( "<div class='error'>Bad configuration: unknown virus scanner: <i>$wgAntivirus</i></div>\n" );
-			return "unknown antivirus: $wgAntivirus";
+			$wgOut->addHTML( "<div class='error'>" . wfMsg('virus-badscanner') . " <i>$wgAntivirus</i></div>\n" );
+			return wfMsg('virus-unknownscanner') . " $wgAntivirus";
 		}
 
 		# look up scanner configuration
@@ -1564,7 +1563,7 @@ wgUploadAutoFill = {$autofill};
 			wfDebug( __METHOD__.": failed to scan $file (code $exitCode).\n" );
 
 			if ( $wgAntivirusRequired ) {
-				return "scan failed (code $exitCode)";
+				return wfMsg('virus-scanfailed', array( $exitCode ) );
 			} else {
 				return NULL;
 			}
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ca67e6f6d7..c14068cb2e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -837,6 +837,11 @@ $2',
 'titleprotected'       => "This title has been protected from creation by [[User:$1|$1]].
 The reason given is ''$2''.",
 
+# Virus scanner
+'virus-badscanner'     => "Bad configuration: unknown virus scanner:",
+'virus-scanfailed'     => "scan failed (code $1)",
+'virus-unknownscanner' => "unknown antivirus:",
+
 # Login and logout pages
 'logouttitle'                => 'User logout',
 'logouttext'                 => '<strong>You are now logged out.</strong>
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index ebb1cb4d40..c0caaa4978 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -313,6 +313,9 @@ $wgOptionalMessages = array(
 	'autocomment-prefix',
 	'listgrouprights-right-display',
 	'timezone-utc',
+	'virus-badscanner',
+	'virus-scanfailed',
+	'virus-unknownscanner',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 0a72ff3d89..aab7647f09 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -356,6 +356,10 @@ $wgMessageStructure = array(
 		'customcssjsprotected',
 		'ns-specialprotected',
 		'titleprotected',
+		'virus-badscanner',
+		'virus-badscanner',
+		'virus-scanfailed',
+		'virus-unknownscanner',
 	),
 	'login' => array(
 		'logouttitle',
-- 
2.20.1