From 960d0a538ddab51456b0d964164719bfdeb44ec0 Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Thu, 22 Oct 2015 10:49:09 -0400 Subject: [PATCH] Move CAPTCHA messages into ConfirmEdit and update class names Depends on I0e55a159efd66a73cd217d9a5e86b2bced90f57a in ConfirmEdit . This should be merged just after that. Also, remove a dead config variable. This leaves only the CAPTCHA stuff that is actually specific to CreateAccount. Change-Id: I8924d537cad3e39adace99fb20626247128d9bd9 --- includes/specials/SpecialUserlogin.php | 5 ----- languages/i18n/en.json | 2 -- languages/i18n/qqq.json | 2 -- .../mediawiki.special/mediawiki.special.userlogin.common.css | 4 ++-- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 0da598bfa0..de69b9d021 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -1385,11 +1385,6 @@ class LoginForm extends SpecialPage { ) ); if ( $this->mType == 'signup' ) { - // XXX hack pending RL or JS parse() support for complex content messages - // https://phabricator.wikimedia.org/T27349 - $out->addJsConfigVars( 'wgCreateacctImgcaptchaHelp', - $this->msg( 'createacct-imgcaptcha-help' )->parse() ); - // Additional styles and scripts for signup form $out->addModules( array( 'mediawiki.special.userlogin.signup.js' diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 3e545d2645..853c9ed2d2 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -435,9 +435,7 @@ "createaccountreason": "Reason:", "createacct-reason": "Reason", "createacct-reason-ph": "Why you are creating another account", - "createacct-captcha": "Security check", "createacct-imgcaptcha-help": "", - "createacct-imgcaptcha-ph": "Enter the text you see above", "createacct-submit": "Create your account", "createacct-another-submit": "Create account", "createacct-benefit-heading": "{{SITENAME}} is made by people like you.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 4bd1055a13..5733c7e1a9 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -609,9 +609,7 @@ "createaccountreason": "Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED\n\n{{Identical|Reason}}", "createacct-reason": "In create account form, label for field to enter reason to create an account when already logged-in.\n\nSee example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]\n{{Identical|Reason}}", "createacct-reason-ph": "Placeholder in vertical-layout create account form for reason field.\n\nSee example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]", - "createacct-captcha": "Label in vertical-layout create account form for CAPTCHA input field when repositioned by JavaScript.", "createacct-imgcaptcha-help": "{{Optional}} Optional help text in vertical-layout create account form for image CAPTCHA input field when repositioned by JavaScript.\n\nBlank by default.", - "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.\n\nSee example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]", "createacct-another-submit": "Submit button of [[Special:UserLogin/signup]] ([[Special:CreateAccount]]) when accessed by a registered user.\n\nThe original means \"create an account in addition to the one you already have\"; sometimes, but not always, it means you are going to \"Create the account on behalf of somebody else\" or \"Create account for another\".\n{{Identical|Create another account}}", "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}} Special:UserLogin?type=signup]\n\nIf in your language you need to know the gender of the name for the wiki (which is the subject of the English sentence), please adapt the sentence as much as you need for your translation to fit.", diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css index 30f000bfe6..831ba8c1fd 100644 --- a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css +++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css @@ -38,7 +38,7 @@ section.mw-form-header { margin-top: 6px; } -.mw-createacct-captcha-container { +.fancycaptcha-captcha-container { background-color: #f8f8f8; border: 1px solid #c9c9c9; padding: 10px; @@ -52,7 +52,7 @@ section.mw-form-header { } /* Put a border around the fancycaptcha-image-container. */ -.mw-createacct-captcha-and-reload { +.fancycaptcha-captcha-and-reload { border: 1px solid #c9c9c9; /* Other display formats end up too wide */ display: table-cell; -- 2.20.1