X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FHTMLForm.php;h=ef24b62b26eb9cda1ffc6abb1b514a0e5528f2ce;hb=bc77c6376f7833b575e95792e1574ea48165b91b;hp=9ced19e993740afad9050c40e1cf30075fd16011;hpb=c21843e256be776bea6cdea3b58bf25b01b0c7da;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 9ced19e993..ef24b62b26 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -34,6 +34,10 @@
  * object, and typically implement at least getInputHTML, which generates
  * the HTML for the input field to be placed in the table.
  *
+ * You can find extensive documentation on the www.mediawiki.org wiki:
+ *  - http://www.mediawiki.org/wiki/HTMLForm
+ *  - http://www.mediawiki.org/wiki/HTMLForm/tutorial
+ *
  * The constructor input is an associative array of $fieldname => $info,
  * where $info is an Associative Array with any of the following:
  *
@@ -73,6 +77,19 @@
  *	                         (eg one without the "wp" prefix), specify it here and
  *	                         it will be used without modification.
  *
+ * Since 1.20, you can chain mutators to ease the form generation:
+ * @par Example:
+ * @code
+ * $form = new HTMLForm( $someFields );
+ * $form->setMethod( 'get' )
+ *      ->setWrapperLegendMsg( 'message-key' )
+ *      ->suppressReset()
+ *      ->prepareForm()
+ *      ->displayForm();
+ * @endcode
+ * Note that you will have prepareForm and displayForm at the end. Other
+ * methods call done after that would simply not be part of the form :(
+ *
  * TODO: Document 'section' / 'subsection' stuff
  */
 class HTMLForm extends ContextSource {
@@ -231,13 +248,16 @@ class HTMLForm extends ContextSource {
 	 * Set format in which to display the form
 	 * @param $format String the name of the format to use, must be one of
 	 *        $this->availableDisplayFormats
+	 * @throws MWException
 	 * @since 1.20
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	public function setDisplayFormat( $format ) {
 		if ( !in_array( $format, $this->availableDisplayFormats ) ) {
 			throw new MWException ( 'Display format must be one of ' . print_r( $this->availableDisplayFormats, true ) );
 		}
 		$this->displayFormat = $format;
+		return $this;
 	}
 
 	/**
@@ -260,6 +280,7 @@ class HTMLForm extends ContextSource {
 	 * Initialise a new Object for the field
 	 * @param $fieldname string
 	 * @param $descriptor string input Descriptor, as described above
+	 * @throws MWException
 	 * @return HTMLFormField subclass
 	 */
 	static function loadInputFromParameters( $fieldname, $descriptor ) {
@@ -288,7 +309,13 @@ class HTMLForm extends ContextSource {
 	}
 
 	/**
-	 * Prepare form for submission
+	 * Prepare form for submission.
+	 *
+	 * @attention When doing method chaining, that should be the very last
+	 * method call before displayForm().
+	 *
+	 * @throws MWException
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function prepareForm() {
 		# Check if we have the info we need
@@ -298,6 +325,7 @@ class HTMLForm extends ContextSource {
 
 		# Load data from the request.
 		$this->loadData();
+		return $this;
 	}
 
 	/**
@@ -350,9 +378,10 @@ class HTMLForm extends ContextSource {
 	/**
 	 * Validate all the fields, and call the submision callback
 	 * function if everything is kosher.
+	 * @throws MWException
 	 * @return Mixed Bool true == Successful submission, Bool false
-	 *	 == No submission attempted, anything else == Error to
-	 *	 display.
+	 *     == No submission attempted, anything else == Error to
+	 *     display.
 	 */
 	function trySubmit() {
 		# Check for validation
@@ -390,45 +419,60 @@ class HTMLForm extends ContextSource {
 	 *	 the output from HTMLForm::filterDataForSubmit, and must
 	 *	 return Bool true on success, Bool false if no submission
 	 *	 was attempted, or String HTML output to display on error.
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setSubmitCallback( $cb ) {
 		$this->mSubmitCallback = $cb;
+		return $this;
 	}
 
 	/**
 	 * Set a message to display on a validation error.
-	 * @param $msg Mixed String or Array of valid inputs to wfMsgExt()
+	 * @param $msg Mixed String or Array of valid inputs to wfMessage()
 	 *	 (so each entry can be either a String or Array)
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setValidationErrorMessage( $msg ) {
 		$this->mValidationErrorMessage = $msg;
+		return $this;
 	}
 
 	/**
 	 * Set the introductory message, overwriting any existing message.
 	 * @param $msg String complete text of message to display
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setIntro( $msg ) {
 		$this->setPreText( $msg );
+		return $this;
 	}
 
 	/**
 	 * Set the introductory message, overwriting any existing message.
 	 * @since 1.19
 	 * @param $msg String complete text of message to display
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
-	function setPreText( $msg ) { $this->mPre = $msg; }
+	function setPreText( $msg ) {
+		$this->mPre = $msg;
+		return $this;
+	}
 
 	/**
 	 * Add introductory text.
 	 * @param $msg String complete text of message to display
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
-	function addPreText( $msg ) { $this->mPre .= $msg; }
+	function addPreText( $msg ) {
+		$this->mPre .= $msg;
+		return $this;
+	}
 
 	/**
 	 * Add header text, inside the form.
 	 * @param $msg String complete text of message to display
 	 * @param $section string The section to add the header to
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function addHeaderText( $msg, $section = null ) {
 		if ( is_null( $section ) ) {
@@ -439,6 +483,7 @@ class HTMLForm extends ContextSource {
 			}
 			$this->mSectionHeaders[$section] .= $msg;
 		}
+		return $this;
 	}
 
 	/**
@@ -446,6 +491,7 @@ class HTMLForm extends ContextSource {
 	 * @since 1.19
 	 * @param $msg String complete text of message to display
 	 * @param $section The section to add the header to
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setHeaderText( $msg, $section = null ) {
 		if ( is_null( $section ) ) {
@@ -453,12 +499,14 @@ class HTMLForm extends ContextSource {
 		} else {
 			$this->mSectionHeaders[$section] = $msg;
 		}
+		return $this;
 	}
 
 	/**
 	 * Add footer text, inside the form.
 	 * @param $msg String complete text of message to display
 	 * @param $section string The section to add the footer text to
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function addFooterText( $msg, $section = null ) {
 		if ( is_null( $section ) ) {
@@ -469,6 +517,7 @@ class HTMLForm extends ContextSource {
 			}
 			$this->mSectionFooters[$section] .= $msg;
 		}
+		return $this;
 	}
 
 	/**
@@ -476,6 +525,7 @@ class HTMLForm extends ContextSource {
 	 * @since 1.19
 	 * @param $msg String complete text of message to display
 	 * @param $section string The section to add the footer text to
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setFooterText( $msg, $section = null ) {
 		if ( is_null( $section ) ) {
@@ -483,39 +533,65 @@ class HTMLForm extends ContextSource {
 		} else {
 			$this->mSectionFooters[$section] = $msg;
 		}
+		return $this;
 	}
 
 	/**
 	 * Add text to the end of the display.
 	 * @param $msg String complete text of message to display
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
-	function addPostText( $msg ) { $this->mPost .= $msg; }
+	function addPostText( $msg ) {
+		$this->mPost .= $msg;
+		return $this;
+	}
 
 	/**
 	 * Set text at the end of the display.
 	 * @param $msg String complete text of message to display
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
-	function setPostText( $msg ) { $this->mPost = $msg; }
+	function setPostText( $msg ) {
+		$this->mPost = $msg;
+		return $this;
+	}
 
 	/**
 	 * Add a hidden field to the output
 	 * @param $name String field name.  This will be used exactly as entered
 	 * @param $value String field value
 	 * @param $attribs Array
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	public function addHiddenField( $name, $value, $attribs = array() ) {
 		$attribs += array( 'name' => $name );
 		$this->mHiddenFields[] = array( $value, $attribs );
+		return $this;
 	}
 
+	/**
+	 * Add a button to the form
+	 * @param $name String field name.
+	 * @param $value String field value
+	 * @param $id String DOM id for the button (default: null)
+	 * @param $attribs Array
+	 * @return HTMLForm $this for chaining calls (since 1.20)
+	 */
 	public function addButton( $name, $value, $id = null, $attribs = null ) {
 		$this->mButtons[] = compact( 'name', 'value', 'id', 'attribs' );
+		return $this;
 	}
 
 	/**
 	 * Display the form (sending to $wgOut), with an appropriate error
 	 * message or stack of messages, and any validation errors, etc.
+	 *
+	 * @attention You should call prepareForm() before calling this function.
+	 * Moreover, when doing method chaining this should be the very last method
+	 * call just after prepareForm().
+	 *
 	 * @param $submitResult Mixed output from HTMLForm::trySubmit()
+	 * @return Nothing, should be last call
 	 */
 	function displayForm( $submitResult ) {
 		$this->getOutput()->addHTML( $this->getHTML( $submitResult ) );
@@ -628,7 +704,7 @@ class HTMLForm extends ContextSource {
 				'input',
 				array(
 					'type' => 'reset',
-					'value' => wfMsg( 'htmlform-reset' )
+					'value' => $this->msg( 'htmlform-reset' )->text()
 				)
 			) . "\n";
 		}
@@ -688,7 +764,7 @@ class HTMLForm extends ContextSource {
 	/**
 	 * Format a stack of error messages into a single HTML string
 	 * @param $errors Array of message keys/values
-	 * @return String HTML, a <ul> list of errors
+	 * @return String HTML, a "<ul>" list of errors
 	 */
 	public static function formatErrors( $errors ) {
 		$errorstr = '';
@@ -704,7 +780,7 @@ class HTMLForm extends ContextSource {
 			$errorstr .= Html::rawElement(
 				'li',
 				array(),
-				wfMsgExt( $msg, array( 'parseinline' ), $error )
+				wfMessage( $msg, $error )->parse()
 			);
 		}
 
@@ -716,18 +792,22 @@ class HTMLForm extends ContextSource {
 	/**
 	 * Set the text for the submit button
 	 * @param $t String plaintext.
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setSubmitText( $t ) {
 		$this->mSubmitText = $t;
+		return $this;
 	}
 
 	/**
 	 * Set the text for the submit button to a message
 	 * @since 1.19
 	 * @param $msg String message key
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	public function setSubmitTextMsg( $msg ) {
 		$this->setSubmitText( $this->msg( $msg )->text() );
+		return $this;
 	}
 
 	/**
@@ -737,45 +817,68 @@ class HTMLForm extends ContextSource {
 	function getSubmitText() {
 		return $this->mSubmitText
 			? $this->mSubmitText
-			: wfMsg( 'htmlform-submit' );
+			: $this->msg( 'htmlform-submit' )->text();
 	}
 
+	/**
+	 * @param $name String Submit button name
+	 * @return HTMLForm $this for chaining calls (since 1.20)
+	 */
 	public function setSubmitName( $name ) {
 		$this->mSubmitName = $name;
+		return $this;
 	}
 
+	/**
+	 * @param $name String Tooltip for the submit button
+	 * @return HTMLForm $this for chaining calls (since 1.20)
+	 */
 	public function setSubmitTooltip( $name ) {
 		$this->mSubmitTooltip = $name;
+		return $this;
 	}
 
 	/**
 	 * Set the id for the submit button.
 	 * @param $t String.
 	 * @todo FIXME: Integrity of $t is *not* validated
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setSubmitID( $t ) {
 		$this->mSubmitID = $t;
+		return $this;
 	}
 
+	/**
+	 * @param $id String DOM id for the form
+	 * @return HTMLForm $this for chaining calls (since 1.20)
+	 */
 	public function setId( $id ) {
 		$this->mId = $id;
+		return $this;
 	}
 	/**
 	 * Prompt the whole form to be wrapped in a "<fieldset>", with
 	 * this text as its "<legend>" element.
 	 * @param $legend String HTML to go inside the "<legend>" element.
 	 *	 Will be escaped
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
-	public function setWrapperLegend( $legend ) { $this->mWrapperLegend = $legend; }
+	public function setWrapperLegend( $legend ) {
+		$this->mWrapperLegend = $legend;
+		return $this;
+	}
 
 	/**
 	 * Prompt the whole form to be wrapped in a "<fieldset>", with
 	 * this message as its "<legend>" element.
 	 * @since 1.19
 	 * @param $msg String message key
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	public function setWrapperLegendMsg( $msg ) {
-		$this->setWrapperLegend( $this->msg( $msg )->escaped() );
+		$this->setWrapperLegend( $this->msg( $msg )->text() );
+		return $this;
 	}
 
 	/**
@@ -783,17 +886,21 @@ class HTMLForm extends ContextSource {
 	 * @todo currently only used for the "<fieldset>" legend on forms
 	 * with multiple sections; should be used elsewhre?
 	 * @param $p String
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setMessagePrefix( $p ) {
 		$this->mMessagePrefix = $p;
+		return $this;
 	}
 
 	/**
 	 * Set the title for form submission
 	 * @param $t Title of page the form is on/should be posted to
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function setTitle( $t ) {
 		$this->mTitle = $t;
+		return $this;
 	}
 
 	/**
@@ -809,9 +916,11 @@ class HTMLForm extends ContextSource {
 	/**
 	 * Set the method used to submit the form
 	 * @param $method String
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	public function setMethod( $method = 'post' ) {
 		$this->mMethod = $method;
+		return $this;
 	}
 
 	public function getMethod() {
@@ -921,9 +1030,11 @@ class HTMLForm extends ContextSource {
 	 * Stop a reset button being shown for this form
 	 * @param $suppressReset Bool set to false to re-enable the
 	 *	 button again
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	function suppressReset( $suppressReset = true ) {
 		$this->mShowReset = !$suppressReset;
+		return $this;
 	}
 
 	/**
@@ -944,7 +1055,7 @@ class HTMLForm extends ContextSource {
 	 * @return String
 	 */
 	public function getLegend( $key ) {
-		return wfMsg( "{$this->mMessagePrefix}-$key" );
+		return $this->msg( "{$this->mMessagePrefix}-$key" )->text();
 	}
 
 	/**
@@ -954,9 +1065,11 @@ class HTMLForm extends ContextSource {
 	 * @since 1.19
 	 *
 	 * @param string|bool $action
+	 * @return HTMLForm $this for chaining calls (since 1.20)
 	 */
 	public function setAction( $action ) {
 		$this->mAction = $action;
+		return $this;
 	}
 
 }
@@ -991,6 +1104,28 @@ abstract class HTMLFormField {
 	 */
 	abstract function getInputHTML( $value );
 
+	/**
+	 * Get a translated interface message
+	 *
+	 * This is a wrapper arround $this->mParent->msg() if $this->mParent is set
+	 * and wfMessage() otherwise.
+	 *
+	 * Parameters are the same as wfMessage().
+	 *
+	 * @return Message object
+	 */
+	function msg() {
+		$args = func_get_args();
+
+		if ( $this->mParent ) {
+			$callback = array( $this->mParent, 'msg' );
+		} else {
+			$callback = 'wfMessage';
+		}
+
+		return call_user_func_array( $callback, $args );
+	}
+
 	/**
 	 * Override this function to add specific validation checks on the
 	 * field input.  Don't forget to call parent::validate() to ensure
@@ -1000,8 +1135,8 @@ abstract class HTMLFormField {
 	 * @return Mixed Bool true on success, or String error to display.
 	 */
 	function validate( $value, $alldata ) {
-		if ( isset( $this->mParams['required'] ) && $value === '' ) {
-			return wfMsgExt( 'htmlform-required', 'parseinline' );
+		if ( isset( $this->mParams['required'] ) && $this->mParams['required'] !== false && $value === '' ) {
+			return $this->msg( 'htmlform-required' )->parse();
 		}
 
 		if ( isset( $this->mValidationCallback ) ) {
@@ -1046,6 +1181,7 @@ abstract class HTMLFormField {
 	/**
 	 * Initialise the object
 	 * @param $params array Associative Array. See HTMLForm doc for syntax.
+	 * @throws MWException
 	 */
 	function __construct( $params ) {
 		$this->mParams = $params;
@@ -1061,7 +1197,7 @@ abstract class HTMLFormField {
 				$msgInfo = array();
 			}
 
-			$this->mLabel = wfMsgExt( $msg, 'parseinline', $msgInfo );
+			$this->mLabel = wfMessage( $msg, $msgInfo )->parse();
 		} elseif ( isset( $params['label'] ) ) {
 			$this->mLabel = $params['label'];
 		}
@@ -1190,7 +1326,6 @@ abstract class HTMLFormField {
 	public function getRaw( $value ) {
 		list( $errors, $errorClass ) = $this->getErrorsAndErrorClass( $value );
 		$inputHtml = $this->getInputHTML( $value );
-		$fieldType = get_class( $this );
 		$helptext = $this->getHelpTextHtmlRaw( $this->getHelpText() );
 		$cellAttributes = array();
 		$label = $this->getLabelHtml( $cellAttributes );
@@ -1262,13 +1397,13 @@ abstract class HTMLFormField {
 		if ( isset( $this->mParams['help-messages'] ) ) {
 			foreach ( $this->mParams['help-messages'] as $name ) {
 				$helpMessage = (array)$name;
-				$msg = wfMessage( array_shift( $helpMessage ), $helpMessage );
+				$msg = $this->msg( array_shift( $helpMessage ), $helpMessage );
 
 				if ( $msg->exists() ) {
 					if ( is_null( $helptext ) ) {
 						$helptext = '';
 					} else {
-						$helptext .= wfMessage( 'word-separator' )->escaped(); // some space
+						$helptext .= $this->msg( 'word-separator' )->escaped(); // some space
 					}
 					$helptext .= $msg->parse(); // Append message
 				}
@@ -1418,18 +1553,15 @@ class HTMLTextField extends HTMLFormField {
 			$attribs['class'] = $this->mClass;
 		}
 
-		if ( isset( $this->mParams['maxlength'] ) ) {
-			$attribs['maxlength'] = $this->mParams['maxlength'];
-		}
-
 		if ( !empty( $this->mParams['disabled'] ) ) {
 			$attribs['disabled'] = 'disabled';
 		}
 
 		# TODO: Enforce pattern, step, required, readonly on the server side as
 		# well
-		foreach ( array( 'min', 'max', 'pattern', 'title', 'step',
-		'placeholder' ) as $param ) {
+		$allowedParams = array( 'min', 'max', 'pattern', 'title', 'step',
+			'placeholder', 'list', 'maxlength' );
+		foreach ( $allowedParams as $param ) {
 			if ( isset( $this->mParams[$param] ) ) {
 				$attribs[$param] = $this->mParams[$param];
 			}
@@ -1536,7 +1668,7 @@ class HTMLFloatField extends HTMLTextField {
 		# http://dev.w3.org/html5/spec/common-microsyntaxes.html#real-numbers
 		# with the addition that a leading '+' sign is ok.
 		if ( !preg_match( '/^((\+|\-)?\d+(\.\d+)?(E(\+|\-)?\d+)?)?$/i', $value ) ) {
-			return wfMsgExt( 'htmlform-float-invalid', 'parse' );
+			return $this->msg( 'htmlform-float-invalid' )->parseAsBlock();
 		}
 
 		# The "int" part of these message names is rather confusing.
@@ -1545,7 +1677,7 @@ class HTMLFloatField extends HTMLTextField {
 			$min = $this->mParams['min'];
 
 			if ( $min > $value ) {
-				return wfMsgExt( 'htmlform-int-toolow', 'parse', array( $min ) );
+				return $this->msg( 'htmlform-int-toolow', $min )->parseAsBlock();
 			}
 		}
 
@@ -1553,7 +1685,7 @@ class HTMLFloatField extends HTMLTextField {
 			$max = $this->mParams['max'];
 
 			if ( $max < $value ) {
-				return wfMsgExt( 'htmlform-int-toohigh', 'parse', array( $max ) );
+				return $this->msg( 'htmlform-int-toohigh', $max )->parseAsBlock();
 			}
 		}
 
@@ -1580,7 +1712,7 @@ class HTMLIntField extends HTMLFloatField {
 		# value to, eg, save in the DB, clean it up with intval().
 		if ( !preg_match( '/^((\+|\-)?\d+)?$/', trim( $value ) )
 		) {
-			return wfMsgExt( 'htmlform-int-invalid', 'parse' );
+			return $this->msg( 'htmlform-int-invalid' )->parseAsBlock();
 		}
 
 		return true;
@@ -1664,7 +1796,7 @@ class HTMLSelectField extends HTMLFormField {
 		if ( in_array( $value, $validOptions ) )
 			return true;
 		else
-			return wfMsgExt( 'htmlform-select-badoption', 'parseinline' );
+			return $this->msg( 'htmlform-select-badoption' )->parse();
 	}
 
 	function getInputHTML( $value ) {
@@ -1702,7 +1834,9 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 
 	function __construct( $params ) {
 		if ( !in_array( 'other', $params['options'], true ) ) {
-			$msg = isset( $params['other'] ) ? $params['other'] : wfMsg( 'htmlform-selectorother-other' );
+			$msg = isset( $params['other'] ) ?
+				$params['other'] :
+				wfMessage( 'htmlform-selectorother-other' )->text();
 			$params['options'][$msg] = 'other';
 		}
 
@@ -1806,7 +1940,7 @@ class HTMLMultiSelectField extends HTMLFormField {
 		if ( count( $validValues ) == count( $value ) ) {
 			return true;
 		} else {
-			return wfMsgExt( 'htmlform-select-badoption', 'parseinline' );
+			return $this->msg( 'htmlform-select-badoption' )->parse();
 		}
 	}
 
@@ -1991,7 +2125,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 
 	/**
 	 * @param  $request WebRequest
-	 * @return Array( <overall message>, <select value>, <text field value> )
+	 * @return Array("<overall message>","<select value>","<text field value>")
 	 */
 	function loadDataFromRequest( $request ) {
 		if ( $request->getCheck( $this->mName ) ) {
@@ -2008,7 +2142,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			} elseif ( $text == '' ) {
 				$final = $list;
 			} else {
-				$final = $list . wfMsgForContent( 'colon-separator' ) . $text;
+				$final = $list . $this->msg( 'colon-separator' )->inContentLanguage()->text() . $text;
 			}
 
 		} else {
@@ -2017,7 +2151,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			$list = 'other';
 			$text = $final;
 			foreach ( $this->mFlatOptions as $option ) {
-				$match = $option . wfMsgForContent( 'colon-separator' );
+				$match = $option . $this->msg( 'colon-separator' )->inContentLanguage()->text();
 				if ( strpos( $text, $match ) === 0 ) {
 					$list = $option;
 					$text = substr( $text, strlen( $match ) );
@@ -2044,8 +2178,8 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			return $p;
 		}
 
-		if ( isset( $this->mParams['required'] ) && $value[1] === '' ) {
-			return wfMsgExt( 'htmlform-required', 'parseinline' );
+		if ( isset( $this->mParams['required'] ) && $this->mParams['required'] !== false && $value[1] === '' ) {
+			return $this->msg( 'htmlform-required' )->parse();
 		}
 
 		return true;
@@ -2074,7 +2208,7 @@ class HTMLRadioField extends HTMLFormField {
 		if ( in_array( $value, $validOptions ) ) {
 			return true;
 		} else {
-			return wfMsgExt( 'htmlform-select-badoption', 'parseinline' );
+			return $this->msg( 'htmlform-select-badoption' )->parse();
 		}
 	}
 
@@ -2284,11 +2418,11 @@ class HTMLEditTools extends HTMLFormField {
 
 	protected function formatMsg() {
 		if ( empty( $this->mParams['message'] ) ) {
-			$msg = wfMessage( 'edittools' );
+			$msg = $this->msg( 'edittools' );
 		} else {
-			$msg = wfMessage( $this->mParams['message'] );
+			$msg = $this->msg( $this->mParams['message'] );
 			if ( $msg->isDisabled() ) {
-				$msg = wfMessage( 'edittools' );
+				$msg = $this->msg( 'edittools' );
 			}
 		}
 		$msg->inContentLanguage();