(bug 34753) Added label for captcha field shown in forms

Every field should have a descriptive label to clarify what is expected
to be entered.

Though users who are using screen readers are not able to retype the
text shown by the captcha image at least they know what the application
is expecting and may get help from other people.

The label text is also added to the translation arrays for English and
German language as well as the descriptive array 'qqq'.

Removed trailing whitespaces and redundant internationalization
according to reviewer's comment.

Removed usage of global $wgOut;

Change-Id: I975dddb60891b162a62e547bb83669c13cb133a1

diff --git a/ConfirmEdit.i18n.php b/ConfirmEdit.i18n.php
index 5689f3a9aeca92e8f15848b7a959018aefd803e2..f0976fd750e4074bb9e4c01fac52ca4f5af12fe4 100644 (file)
--- a/ConfirmEdit.i18n.php
+++ b/ConfirmEdit.i18n.php
@@ -11,6 +11,7 @@ $messages = array();
 $messages['en'] = array(
        'captcha-edit'               => 'To edit this page, please solve the simple sum below and enter the answer in the box ([[Special:Captcha/help|more info]]):',
        'captcha-desc'               => 'Provides CAPTCHA techniques to protect against spam and password-guessing',
+       'captcha-label'              => 'CAPTCHA',
        'captcha-addurl'             => '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-badlogin'           => 'To help protect against automated password cracking, please solve the simple sum below and enter the answer in the box ([[Special:Captcha/help|more info]]):',
@@ -60,6 +61,7 @@ See also
 *{{msg-mw|Questycaptcha-edit}}
 *{{msg-mw|Fancycaptcha-edit}}',
        'captcha-desc' => '{{desc}}',
+       'captcha-label' => 'Label field for input field shown in forms',
        'captcha-addurl' => 'The explanation of CAPTCHA shown to users trying to add new external links.
 See also
 *{{msg-mw|Questycaptcha-addurl}}

diff --git a/FancyCaptcha.class.php b/FancyCaptcha.class.php
index 6da3207d5a954f9923f6ccaf0ebc625dfc5149aa..4b831cc0676797196935370746ebee9685be2ca2 100644 (file)
--- a/FancyCaptcha.class.php
+++ b/FancyCaptcha.class.php
@@ -57,24 +57,28 @@ class FancyCaptcha extends SimpleCaptcha {
                $title = SpecialPage::getTitleFor( 'Captcha', 'image' );
 
                return "<p>" .
-                       Xml::element( 'img', array(
+                       Html::element( 'img', array(
                                'src'    => $title->getLocalUrl( 'wpCaptchaId=' . urlencode( $index ) ),
                                'width'  => $info['width'],
                                'height' => $info['height'],
                                'alt'    => '' ) ) .
                        "</p>\n" .
-                       Xml::element( 'input', array(
+                       Html::element( 'input', array(
                                'type'  => 'hidden',
                                'name'  => 'wpCaptchaId',
                                'id'    => 'wpCaptchaId',
                                'value' => $index ) ) .
-                       "<p>" .
+                       '<p>' .
+                       Html::element( 'label', array(
+                               'for' => 'wpCaptchaWord',
+                       ), parent::getMessage( 'label' ) . wfMsg( 'colon-separator' ) .
                        Html::element( 'input', array(
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',
+                               'type' => 'text',
                                'autocorrect' => 'off',
                                'autocapitalize' => 'off',
-                               'required',
+                               'required' => 'required',
                                'tabindex' => 1 ) ) . // tab in before the edit textarea
                        "</p>\n";
        }