[dw-free] Provide a "contact us if you can't use this" string under all CAPTCHAs

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/fe18f5fe4113]

http://bugs.dwscoalition.org/show_bug.cgi?id=632

Spam means we can't just up and get rid of captcha, but no sense making it
hard for *people* to contact us.

Patch by wychwood.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/LJ/Widget/CreateAccount.pm
• cgi-bin/LJ/Widget/SubmitRequest.pm
• cgi-bin/talklib.pl
• htdocs/lostinfo.bml
• htdocs/register.bml

--------------------------------------------------------------------------------
diff -r ad11c0cbdc54 -r fe18f5fe4113 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Sat Aug 08 14:50:11 2009 +0000
+++ b/bin/upgrading/en.dat	Sat Aug 08 15:16:42 2009 +0000
@@ -33,6 +33,8 @@ btn.add=Add
 btn.add=Add
 
 btn.search=Search
+
+captcha.accessibility.contact=If you are unable to use this captcha for any reason, please contact us by email at [[email]]
 
 cleanhtml.suspend_msg=This is a suspended entry.
 
diff -r ad11c0cbdc54 -r fe18f5fe4113 cgi-bin/LJ/Widget/CreateAccount.pm
--- a/cgi-bin/LJ/Widget/CreateAccount.pm	Sat Aug 08 14:50:11 2009 +0000
+++ b/cgi-bin/LJ/Widget/CreateAccount.pm	Sat Aug 08 15:16:42 2009 +0000
@@ -197,6 +197,7 @@ sub render_body {
             my $c = Captcha::reCAPTCHA->new;
             $ret .= $c->get_options_setter({ theme => 'white' });
             $ret .= $c->get_html( LJ::conf_test($LJ::RECAPTCHA{public_key}), '', $LJ::IS_SSL );
+            $ret .= "<p>" . BML::ml( 'captcha.accessibility.contact', { email => $LJ::SUPPORT_EMAIL } ) . "</p>";
         } else {
             # flag to indicate they've submitted with 'audio' as the answer to the captcha challenge
             my $wants_audio = $from_post->{wants_audio} || 0;
diff -r ad11c0cbdc54 -r fe18f5fe4113 cgi-bin/LJ/Widget/SubmitRequest.pm
--- a/cgi-bin/LJ/Widget/SubmitRequest.pm	Sat Aug 08 14:50:11 2009 +0000
+++ b/cgi-bin/LJ/Widget/SubmitRequest.pm	Sat Aug 08 15:16:42 2009 +0000
@@ -110,6 +110,7 @@ sub render_body {
         $ret .= "<p><?de " . $class->text_captcha(%opts) . " de?></p>";
         $ret .= "<div style='position: relative; height: 1%;'>" . $c->get_options_setter({ theme => 'white' });
         $ret .= $c->get_html( LJ::conf_test($LJ::RECAPTCHA{public_key}) ) . "</div>";
+        $ret .= "<p>" . BML::ml( 'captcha.accessibility.contact', { email => $LJ::SUPPORT_EMAIL } ) . "</p>";
         $ret .= "</div></p>";
     }
 
diff -r ad11c0cbdc54 -r fe18f5fe4113 cgi-bin/talklib.pl
--- a/cgi-bin/talklib.pl	Sat Aug 08 14:50:11 2009 +0000
+++ b/cgi-bin/talklib.pl	Sat Aug 08 15:16:42 2009 +0000
@@ -1763,6 +1763,7 @@ QQ
             my $c = Captcha::reCAPTCHA->new;
             $ret .= $c->get_options_setter({ theme => 'white' });
             $ret .= $c->get_html( LJ::conf_test($LJ::RECAPTCHA{public_key}) );
+            $ret .= "<p>" . BML::ml( 'captcha.accessibility.contact', { email => $LJ::SUPPORT_EMAIL } ) . "</p>";
         } else {
             my ($wants_audio, $captcha_sess, $captcha_chal);
             $wants_audio = 1 if lc($form->{answer}) eq 'audio';
diff -r ad11c0cbdc54 -r fe18f5fe4113 htdocs/lostinfo.bml
--- a/htdocs/lostinfo.bml	Sat Aug 08 14:50:11 2009 +0000
+++ b/htdocs/lostinfo.bml	Sat Aug 08 15:16:42 2009 +0000
@@ -26,6 +26,7 @@ body<=
             my $c = Captcha::reCAPTCHA->new;
             $ret .= $c->get_options_setter({ theme => 'white' });
             $ret .= $c->get_html( LJ::conf_test($LJ::RECAPTCHA{public_key}), '', $LJ::IS_SSL ) . "<br />\n";
+            $ret .= "<p>" . BML::ml( 'captcha.accessibility.contact', { email => $LJ::SUPPORT_EMAIL } ) . "</p>";
         }
 
 
diff -r ad11c0cbdc54 -r fe18f5fe4113 htdocs/register.bml
--- a/htdocs/register.bml	Sat Aug 08 14:50:11 2009 +0000
+++ b/htdocs/register.bml	Sat Aug 08 15:16:42 2009 +0000
@@ -101,6 +101,7 @@ body<=
             $ret .= "<form method='POST' action='$LJ::SITEROOT/register'><input type='hidden' name='qs' value='$qs'>";
             $ret .= $c->get_options_setter({ theme => 'white' });
             $ret .= $c->get_html( LJ::conf_test($LJ::RECAPTCHA{public_key}) );
+            $ret .= "<p>" . BML::ml( 'captcha.accessibility.contact', { email => $LJ::SUPPORT_EMAIL } ) . "</p>";
             $ret .= "<input type='submit' value='$ML{'.validate.human.submit'}' ></form>";
             return $ret;
         }
--------------------------------------------------------------------------------