From: Fomafix <fomafix@googlemail.com>
Date: Thu, 12 Jun 2014 05:58:44 +0000 (+0000)
Subject: Replace hardcoded square brackets by message brackets
X-Git-Tag: 1.31.0-rc.0~15173^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=f74890b891b8ca5d822cf2d9f2922403b7c89253;p=lhc%2Fweb%2Fwiklou.git

Replace hardcoded square brackets by message brackets

* Rename $temp into $attribs

Change-Id: Id8792f9e6d0de6460a5c6a4ae34b8a745fe2409e
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 03e50fc89d..3d57e95895 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3839,46 +3839,34 @@ HTML
 	public function getEditButtons( &$tabindex ) {
 		$buttons = array();
 
-		// @todo FIXME: Hardcoded square brackets.
-		$temp = array(
+		$attribs = array(
 			'id' => 'wpSave',
 			'name' => 'wpSave',
 			'type' => 'submit',
 			'tabindex' => ++$tabindex,
 			'value' => wfMessage( 'savearticle' )->text(),
-			'accesskey' => wfMessage( 'accesskey-save' )->text(),
-			'title' => wfMessage( 'tooltip-save' )->text()
-				. ' [' . wfMessage( 'accesskey-save' )->text() . ']',
-		);
-		$buttons['save'] = Xml::element( 'input', $temp, '' );
+		) + Linker::tooltipAndAccesskeyAttribs( 'save' );
+		$buttons['save'] = Xml::element( 'input', $attribs, '' );
 
 		++$tabindex; // use the same for preview and live preview
-		// @todo FIXME: Hardcoded square brackets.
-		$temp = array(
+		$attribs = array(
 			'id' => 'wpPreview',
 			'name' => 'wpPreview',
 			'type' => 'submit',
 			'tabindex' => $tabindex,
 			'value' => wfMessage( 'showpreview' )->text(),
-			'accesskey' => wfMessage( 'accesskey-preview' )->text(),
-			'title' => wfMessage( 'tooltip-preview' )->text()
-				. ' [' . wfMessage( 'accesskey-preview' )->text() . ']',
-		);
-		$buttons['preview'] = Xml::element( 'input', $temp, '' );
+		) + Linker::tooltipAndAccesskeyAttribs( 'preview' );
+		$buttons['preview'] = Xml::element( 'input', $attribs, '' );
 		$buttons['live'] = '';
 
-		// @todo FIXME: Hardcoded square brackets.
-		$temp = array(
+		$attribs = array(
 			'id' => 'wpDiff',
 			'name' => 'wpDiff',
 			'type' => 'submit',
 			'tabindex' => ++$tabindex,
 			'value' => wfMessage( 'showdiff' )->text(),
-			'accesskey' => wfMessage( 'accesskey-diff' )->text(),
-			'title' => wfMessage( 'tooltip-diff' )->text()
-				. ' [' . wfMessage( 'accesskey-diff' )->text() . ']',
-		);
-		$buttons['diff'] = Xml::element( 'input', $temp, '' );
+		) + Linker::tooltipAndAccesskeyAttribs( 'diff' );
+		$buttons['diff'] = Xml::element( 'input', $attribs, '' );
 
 		wfRunHooks( 'EditPageBeforeEditButtons', array( &$this, &$buttons, &$tabindex ) );
 		return $buttons;