Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183991
Change subject: Registration: Move help text to placeholder
......................................................................
Registration: Move help text to placeholder
Also: Transform "Choose own" to be the label of the text input and killed
the own label (word duplication and confusing help text).
Change-Id: I2b41890289b20d1081090466bbfd3bc775b09f09
---
M i18n/en.json
M includes/specials/SpecialGoogleLogin.php
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin
refs/changes/91/183991/1
diff --git a/i18n/en.json b/i18n/en.json
index 89f08f7..a80ff2f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,7 +20,7 @@
"googlelogin-form-choosename-existerror": "The username ''$1'' is
already in use, please choose another.",
"googlelogin-form-chooseown": "Choose own",
"googlelogin-form-chooseown-error": "Please let us know your desired
username or take one of our suggestions.",
- "googlelogin-form-choosename-help": "\"Own name\" is only observed, if
you choose \"{{int:googlelogin-form-chooseown}}\".",
+ "googlelogin-form-choosename-help": "Your username",
"googlelogin-form-merge-title": "Link user account",
"googlelogin-form-logout": "Login with another Google account",
"googlelogin-form-backlink": "Back to Google login",
diff --git a/includes/specials/SpecialGoogleLogin.php
b/includes/specials/SpecialGoogleLogin.php
index 009df54..4a87db7 100644
--- a/includes/specials/SpecialGoogleLogin.php
+++ b/includes/specials/SpecialGoogleLogin.php
@@ -195,7 +195,7 @@
if ( GoogleLogin::isValidUsername(
$userInfo['name']['givenName'] ) ) {
$names[$userInfo['name']['givenName']] =
'wpGivenName';
}
- $names[wfMessage( 'googlelogin-form-chooseown'
)->text()] = 'wpOwn';
+ $names[wfMessage( 'googlelogin-form-chooseown'
)->text() . ':'] = 'wpOwn';
$defaultName = ($request->getVal( 'wpChooseName' ) !==
null ?
$request->getVal( 'wpChooseName' ) : 'wpOwn');
$formElements = array(
@@ -210,8 +210,7 @@
'section' => 'choosename',
'class' => 'HTMLTextField',
'default' => $request->getVal(
'wpChooseOwn' ),
- 'label' => wfMessage(
'googlelogin-form-chooseown' )->text() . ':',
- 'help' => wfMessage(
'googlelogin-form-choosename-help' )->text()
+ 'placeholder' => wfMessage(
'googlelogin-form-choosename-help' )->text()
),
);
$htmlForm = new HTMLForm( $formElements,
$this->getContext(), 'googlelogin-form' );
--
To view, visit https://gerrit.wikimedia.org/r/183991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b41890289b20d1081090466bbfd3bc775b09f09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
