Localize Virus scanner messages.

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 81d5b07..37564cf 100644 (file)
--- 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 ca67e6f..c14068c 100644 (file)
--- 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 ebb1cb4..c0caaa4 100644 (file)
--- 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 0a72ff3..aab7647 100644 (file)
--- 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',