From: S Page <spage@wikimedia.org>
Date: Sat, 27 Apr 2013 05:00:55 +0000 (-0700)
Subject: Message tweaks to new login and create acct forms
X-Git-Tag: 1.31.0-rc.0~19787^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=d77fd5a7cbbbb657c5cc270e27412814a455ca62;p=lhc%2Fweb%2Fwiklou.git

Message tweaks to new login and create acct forms

* "Keep me logged in" (bug 47694)
* "[Create my account]" submit button (bug 47700)
* "Why you are creating another account" placeholder (bug 31888)

Bug: 47694
Bug: 47700
Bug: 31888

Change-Id: I7cfa4bb36368277a934144c1724ec437c426eacf
---

diff --git a/includes/templates/UsercreateVForm.php b/includes/templates/UsercreateVForm.php
index f379e3a266..b8ce27e387 100644
--- a/includes/templates/UsercreateVForm.php
+++ b/includes/templates/UsercreateVForm.php
@@ -185,9 +185,13 @@ class UsercreateTemplateVForm extends BaseTemplate {
 		if ( $this->data['usereason'] ) { ?>
 			<div>
 				<label for='wpReason'><?php $this->msg( 'createacct-reason' ); ?></label>
-				<input type='text' class='mw-input loginText' name="wpReason" id="wpReason"
-						tabindex="8"
-						value="<?php $this->text( 'reason' ); ?>" size='20' />
+				<?php echo Html::input( 'wpReason', $this->data['reason'], 'text', array(
+					'class' => 'mw-input loginText',
+					'id' => 'wpReason',
+					'tabindex' => '8',
+					'size' => '20',
+					'placeholder' => $this->getMsg( 'createacct-reason-ph' )->text()
+				) ); ?>
 			</div>
 		<?php }
 		$tabIndex = 9;
@@ -251,7 +255,7 @@ class UsercreateTemplateVForm extends BaseTemplate {
 		<div class="mw-submit">
 			<input type='submit' class="mw-ui-button mw-ui-big mw-ui-block mw-ui-primary" name="wpCreateaccount" id="wpCreateaccount"
 				tabindex="<?php echo $tabIndex++; ?>"
-				value="<?php $this->msg( 'createaccount' ); ?>" />
+				value="<?php $this->msg( 'createacct-submit' ); ?>" />
 		</div>
 	<input type="hidden" id="useNew" name="useNew" value="1" />
 <?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 3a5d11233e..c03d4d5938 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1092,7 +1092,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'createacct-yourpasswordagain'    => 'Confirm password',
 'createacct-yourpasswordagain-ph' => 'Enter password again',
 'remembermypassword'           => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
-'userlogin-remembermypassword' => 'Remember me',
+'userlogin-remembermypassword' => 'Keep me logged in',
 'userlogin-signwithsecure'     => 'Sign in with secure server',
 'securelogin-stick-https'      => 'Stay connected to HTTPS after login',
 'yourdomainname'               => 'Your domain:',
@@ -1125,10 +1125,12 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'createacct-realname'             => 'Real name (optional)',
 'createaccountreason'          => 'Reason:',
 'createacct-reason'               => 'Reason',
+'createacct-reason-ph'            => 'Why you are creating another account',
 'createacct-captcha'              => 'Security check',
 'createacct-captcha-help-url'     => '{{ns:Project}}:Request an account',
 'createacct-imgcaptcha-help'      => 'Can\'t see the image? [[{{MediaWiki:createacct-captcha-help-url}}|Request an account]]',
 'createacct-imgcaptcha-ph'        => 'Enter the text you see above',
+'createacct-submit'               => 'Create your account',
 'createacct-benefit-heading'      => '{{SITENAME}} is made by people like you.',
 'createacct-benefit-icon1'        => 'icon-edits',
 'createacct-benefit-head1'        => '{{NUMBEROFEDITS}}',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index fd25897dbf..48543387ce 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1165,12 +1165,14 @@ See example: [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:Us
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:UserLogin?type=signup&useNew=1]
 {{Identical|Reason}}',
+'createacct-reason-ph' => 'Placeholder in vertical-layout create account form for reason field.',
 'createacct-captcha' => 'Label in vertical-layout create account form for CAPTCHA input field when repositioned by JavaScript.',
 'createacct-captcha-help-url' => 'The URL of a page providing CAPTCHA assistance for the wiki.
 
 Used as a link in {{msg-mw|Createacct-imgcaptcha-help}}.',
 'createacct-imgcaptcha-help' => 'Help text in vertical-layout create account form for image CAPTCHA input field when repositioned by JavaScript.',
 'createacct-imgcaptcha-ph' => 'Placehodler text in vertical-layout create account form for image CAPTCHA input field when repositioned by JavaScript.',
+'createacct-submit' => 'Submit button on vertical-layout create account form.',
 'createacct-benefit-heading' => 'In vertical-layout create account form, the heading for the section describing the benefits of creating an account.
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:UserLogin?type=signup&useNew=1]',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 60f2e7ad48..72ad621afa 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -474,10 +474,12 @@ $wgMessageStructure = array(
 		'createacct-realname',
 		'createaccountreason',
 		'createacct-reason',
+		'createacct-reason-ph',
 		'createacct-captcha',
 		'createacct-captcha-help-url',
 		'createacct-imgcaptcha-help',
 		'createacct-imgcaptcha-ph',
+		'createacct-submit',
 		'createacct-benefit-heading',
 		'createacct-benefit-icon1',
 		'createacct-benefit-head1',