Blank some new Create account messages by default

Do not show the "(help me choose)" and "Can't see the image?  _Request
an account_" links.  They can still be customized on-wiki, but the
default value is empty.

The content and URLs that we encourage for these messages on WMF wikis
are now in extension WikimediaMessages (change I28b0079b).

Add comment to vform create account JavaScript.

Bug: 47801
Change-Id: Ie0888cd0582dc3f63ae569097159a4d9b171a5df

diff --git a/includes/templates/UsercreateVForm.php b/includes/templates/UsercreateVForm.php
index 626f880..2e72f70 100644 (file)
--- a/includes/templates/UsercreateVForm.php
+++ b/includes/templates/UsercreateVForm.php
@@ -80,7 +80,7 @@ class UsercreateTemplateVForm extends BaseTemplate {
                        <label for='wpName2'>
                                <?php $this->msg( 'userlogin-yourname' ); ?>
 
-                               <span class="mw-ui-flush-right"><?php echo $this->getMsg( 'createacct-helpusername-link' )->parse(); ?></span>
+                               <span class="mw-ui-flush-right"><?php echo $this->getMsg( 'createacct-helpusername' )->parse(); ?></span>
                        </label>
                        <?php echo Html::input( 'wpName', $this->data['name'], 'text', array(
                                'class' => 'mw-input loginText',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index df89a75..3fb49ce 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1083,8 +1083,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'yourname'                        => 'Username:',
 'userlogin-yourname'              => 'Username',
 'userlogin-yourname-ph'           => 'Enter your username',
-'createacct-helpusername-url'     => '{{ns:Project}}:Username_policy',
-'createacct-helpusername-link'    => '[[{{MediaWiki:createacct-helpusername-url}}|(help me choose)]]',
+'createacct-helpusername'      => '', # do not translate or duplicate this message to other languages
 'yourpassword'                    => 'Password:',
 'userlogin-yourpassword'          => 'Password',
 'userlogin-yourpassword-ph'       => 'Enter your password',
@@ -1129,8 +1128,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 '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-help'      => '', # do not translate or duplicate this message to other languages
 'createacct-imgcaptcha-ph'        => 'Enter the text you see above',
 'createacct-submit'               => 'Create your account',
 'createacct-benefit-heading'      => '{{SITENAME}} is made by people like you.',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index fb9fd2c..b44ac27 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1050,9 +1050,7 @@ See examples: [{{canonicalurl:Special:UserLogin|useNew=1}} Special:UserLogin?use
 'userlogin-yourname-ph' => 'Placeholder text in new userlogin/create account form field.
 
 See example: [{{canonicalurl:Special:UserLogin|useNew=1}} Special:UserLogin?useNew=1] and [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:UserLogin?type=signup&useNew=1]',
-'createacct-helpusername-url' => 'The URL of a page providing username guidance for the wiki.
-Used as a link in the {{msg-mw|Createacct-helpusername}} on WMF wikis.',
-'createacct-helpusername-link' => 'Message in new create account form providing guidance for username.
+'createacct-helpusername' => 'Message in new create account form providing guidance for username.
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:UserLogin?type=signup&useNew=1]',
 'yourpassword' => 'In user preferences
@@ -1189,9 +1187,6 @@ 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]',
 '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.

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index b997fe0..87c4000 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -224,6 +224,8 @@ $wgIgnoredMessages = array(
        'deletedarticle',
        // 'uploadedimage',
        // 'overwroteimage',
+       'createacct-helpusername',
+       'createacct-imgcaptcha-help',
        'userlogout-summary',
        'changeemail-summary',
        'changepassword-summary',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 050b86e..876b03d 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -431,8 +431,7 @@ $wgMessageStructure = array(
                'yourname',
                'userlogin-yourname',
                'userlogin-yourname-ph',
-               'createacct-helpusername-url',
-               'createacct-helpusername-link',
+               'createacct-helpusername',
                'yourpassword',
                'userlogin-yourpassword',
                'userlogin-yourpassword-ph',
@@ -477,7 +476,6 @@ $wgMessageStructure = array(
                'createacct-reason',
                'createacct-reason-ph',
                'createacct-captcha',
-               'createacct-captcha-help-url',
                'createacct-imgcaptcha-help',
                'createacct-imgcaptcha-ph',
                'createacct-submit',

diff --git a/resources/mediawiki.special/mediawiki.special.createAccount.vform.js b/resources/mediawiki.special/mediawiki.special.createAccount.vform.js
index 9fd176b..0cbf31b 100644 (file)
--- a/resources/mediawiki.special/mediawiki.special.createAccount.vform.js
+++ b/resources/mediawiki.special/mediawiki.special.createAccount.vform.js
@@ -9,6 +9,8 @@
                        tabIndex,
                        $captchaStuff,
                        $captchaImageContainer,
+                       // JavaScript can't yet parse the message createacct-imgcaptcha-help when it
+                       // contains a MediaWiki transclusion, so PHP parses it and sends the HTML.
                        helpMsg = mw.config.get( 'wgCreateacctImgcaptchaHelp' ),
                        helpHtml = '';
 
@@ -40,7 +42,7 @@
                                helpHtml = '<small class="mw-createacct-captcha-assisted">' + helpMsg + '</small>';
                        }
 
-                       // Insert another div before the submit button that will include the 
+                       // Insert another div before the submit button that will include the
                        // repositioned FancyCaptcha div, an input field, and possible help.
                        $submit.closest( 'div' )
                                .before( [