(bug 8484) Provide a getMessage() method that individual captcha plugins can use...

diff --git a/ConfirmEdit.i18n.php b/ConfirmEdit.i18n.php
index 9e7b83a696b0ef91cdce544f6dbcc850de58d01f..4d9b99df33104458182935bd2f7df67ed5d476c7 100644 (file)
--- a/ConfirmEdit.i18n.php
+++ b/ConfirmEdit.i18n.php
@@ -9,8 +9,11 @@
 $wgConfirmEditMessages = array();
 
 $wgConfirmEditMessages['en'] = array(
-       'captcha-short'              => "Your edit includes new URL links; as a protection against automated spam, you'll need to type in the words that appear in this image:<br />
-([[Special:Captcha/help|What is this?]])",
+       'captcha-edit' => 'Your edit includes new external links. To help protect against automated
+       spam, please solve the simple sum below and enter the answer in the box ([[Special:Captcha/help|more info]]):',
+       'captcha-createaccount' => 'To help protect against automated account creation, please solve the simple sum
+       below and enter the answer in the box ([[Special:Captcha/help|more info]]):',
+       'captcha-createaccount-fail' => "Incorrect or missing confirmation code.",
        'captchahelp-title'          => 'Captcha help',
        'captchahelp-text'           => "Web sites that accept postings from the public, like this wiki, are often abused by spammers who use automated tools to post their links to many sites. While these spam links can be removed, they are a significant nuisance.
 
@@ -19,10 +22,8 @@ Sometimes, especially when adding new web links to a page, the wiki may show you
 Unfortunately this may inconvenience users with limited vision or using text-based or speech-based browsers. At the moment we do not have an audio alternative available. Please contact the site administrators for assistance if this is unexpectedly preventing you from making legitimate posts.
 
 Hit the 'back' button in your browser to return to the page editor.",
-       'captcha-createaccount'      => "As a protection against automated spam, you'll need to type in the words that appear in this image to register an account:<br />
-([[Special:Captcha/help|What is this?]])",
-       'captcha-createaccount-fail' => "Incorrect or missing confirmation code.",
 );
+
 $wgConfirmEditMessages['af'] = array(
        'captcha-short'              => "U wysiging bevat nuwe webskakels. Neem kennis dat blote reklame van u werf, produk of besigheid as vandalisme beskou kan word. As beskerming teen outomatiese gemorsbydraes, sal u die woorde wat onder verskyn in die prentjie moet intik: <br />([[Spesiaal:Captcha/help|Wat is hierdie?]])",
        'captchahelp-title'          => 'Captcha-hulp',

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 3c90249607b6efa3aa130d7d5cdb5f7af7273ed6..1167f1f555150188dc127842cedcd47a30c0dea7 100644 (file)
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -108,9 +108,8 @@ $wgSpecialPages['Captcha'] = array( /*class*/ 'SpecialPage', /*name*/'Captcha',
 function ceSetup() {
        # Add messages
        global $wgMessageCache, $wgConfirmEditMessages;
-       foreach( $wgConfirmEditMessages as $key => $value ) {
-               $wgMessageCache->addMessages( $wgConfirmEditMessages[$key], $key );
-       }
+       foreach( $wgConfirmEditMessages as $lang => $messages )
+               $wgMessageCache->addMessages( $messages, $lang );
        
        global $wgHooks, $wgCaptcha, $wgCaptchaClass, $wgSpecialPages;
        $wgCaptcha = new $wgCaptchaClass();
@@ -172,10 +171,25 @@ class SimpleCaptcha {
         * @param OutputPage $out
         */
        function editCallback( &$out ) {
-               $out->addWikiText( wfMsg( "captcha-short" ) );  
+               $out->addWikiText( $this->getMessage( 'edit' ) );
                $out->addHTML( $this->getForm() );
        }
        
+       /**
+        * Show a message asking the user to enter a captcha on edit
+        * The result will be treated as wiki text
+        *
+        * @param $action Action being performed
+        * @return string
+        */
+       function getMessage( $action ) {
+               $name = 'captcha-' . $action;
+               $text = wfMsg( $name );
+               # Obtain a more tailored message, if possible, otherwise, fall back to
+               # the default for edits
+               return wfEmptyMsg( $name, $text ) ? wfMsg( 'captcha-edit' ) : $text;
+       }
+       
        /**
         * Inject whazawhoo
         * @fixme if multiple thingies insert a header, could break
@@ -187,7 +201,7 @@ class SimpleCaptcha {
                if( $wgCaptchaTriggers['createaccount'] ) {
                        $template->set( 'header',
                                "<div class='captcha'>" .
-                               $wgOut->parse( wfMsg( 'captcha-createaccount' ) ) .
+                               $wgOut->parse( $this->getMessage( 'createaccount' ) ) .
                                $this->getForm() .
                                "</div>\n" );
                }

diff --git a/FancyCaptcha.i18n.php b/FancyCaptcha.i18n.php
new file mode 100644 (file)
index 0000000..a6b9927
--- /dev/null
+++ b/FancyCaptcha.i18n.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Internationalisation file for the FancyCaptcha plug-in
+ *
+ * @package MediaWiki
+ * @subpackage Extensions
+*/
+
+function efFancyCaptchaMessages() {
+       return array(
+       
+/* English */
+'en' => array(
+'fancycaptcha-edit' => 'Your edit includes new external links. To help protect against automated
+spam, please enter the words that appear below in the box ([[Special:Captcha/help|more info]]):',
+'fancycaptcha-createaccount' => 'To help protect against automated account creation, please enter the words
+that appear below in the box ([[Special:Captcha/help|more info]]):',
+),
+
+       );
+}
+
+?>

diff --git a/FancyCaptcha.php b/FancyCaptcha.php
index c21afb8c854775c82add2f4b2f6b60467e145501..ceda5a506c3a57b487598ddc5f55645ac20a6060 100644 (file)
--- a/FancyCaptcha.php
+++ b/FancyCaptcha.php
@@ -33,6 +33,14 @@ $wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
 global $wgCaptchaSecret;
 $wgCaptchaSecret = "CHANGE_THIS_SECRET!";
 
+$wgExtensionFunctions[] = 'efFancyCaptcha';
+
+function efFancyCaptcha() {
+       global $wgMessageCache;
+       require_once( dirname( __FILE__ ) . '/FancyCaptcha.i18n.php' );
+       foreach( efFancyCaptchaMessages() as $lang => $messages )
+               $wgMessageCache->addMessages( $messages, $lang );
+}
 
 class FancyCaptcha extends SimpleCaptcha {
        /**
@@ -176,6 +184,22 @@ class FancyCaptcha extends SimpleCaptcha {
                wfHttpError( 500, 'Internal Error', 'Requested bogus captcha image' );
                return false;
        }
+       
+       /**
+        * Show a message asking the user to enter a captcha on edit
+        * The result will be treated as wiki text
+        *
+        * @param $action Action being performed
+        * @return string
+        */
+       function getMessage( $action ) {
+               $name = 'fancycaptcha-' . $action;
+               $text = wfMsg( $name );
+               # Obtain a more tailored message, if possible, otherwise, fall back to
+               # the default for edits
+               return wfEmptyMsg( $name, $text ) ? wfMsg( 'fancycaptcha-edit' ) : $text;
+       }
+       
 }
 
 } # End invocation guard