| Index: trunk/extensions/ConfirmAccount/RequestAccount_body.php |
| — | — | @@ -78,8 +78,9 @@ |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | protected function showForm( $msg = '', $forgotFile = 0 ) { |
| 82 | | - global $wgOut, $wgUser, $wgUseRealNamesOnly, $wgAllowRealName, $wgAccountRequestToS, |
| 83 | | - $wgAccountRequestTypes, $wgAccountRequestExtraInfo, $wgAllowAccountRequestFiles; |
| | 82 | + global $wgOut, $wgUser, $wgUseRealNamesOnly, $wgAllowRealName; |
| | 83 | + global $wgAccountRequestToS, $wgAccountRequestTypes, $wgAccountRequestExtraInfo, |
| | 84 | + $wgAllowAccountRequestFiles, $wgMakeUserPageFromBio; |
| 84 | 85 | |
| 85 | 86 | $this->mForgotAttachment = $forgotFile; |
| 86 | 87 | |
| — | — | @@ -153,7 +154,11 @@ |
| 154 | 155 | |
| 155 | 156 | $form .= '<fieldset>'; |
| 156 | 157 | $form .= '<legend>' . wfMsgHtml( 'requestaccount-leg-person' ) . '</legend>'; |
| 157 | | - $form .= wfMsgExt( 'requestaccount-bio-text', array( 'parse' ) ) . "\n"; |
| | 158 | + if ( $wgMakeUserPageFromBio ) { |
| | 159 | + $form .= wfMsgExt( 'requestaccount-bio-text-i', 'parse' ) . "\n"; |
| | 160 | + } |
| | 161 | + $form .= wfMsgExt( 'requestaccount-bio-text', 'parse' ) . "\n"; |
| | 162 | + |
| 158 | 163 | if ( $wgUseRealNamesOnly || $wgAllowRealName ) { |
| 159 | 164 | $form .= '<table cellpadding=\'4\'>'; |
| 160 | 165 | $form .= "<tr><td>" . Xml::label( wfMsgHtml( 'requestaccount-real' ), 'wpRealName' ) . "</td>"; |
| Index: trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php |
| — | — | @@ -27,25 +27,24 @@ |
| 28 | 28 | 'requestaccount-acc-text' => 'Your e-mail address will be sent a confirmation message once this request is submitted. |
| 29 | 29 | Please respond by clicking on the confirmation link provided by the e-mail. |
| 30 | 30 | Also, your password will be e-mailed to you when your account is created.', |
| 31 | | - 'requestaccount-areas' => '', # Do not translate this message to other languages |
| | 31 | + 'requestaccount-areas' => '', # Do not translate this message to other languages |
| 32 | 32 | 'requestaccount-areas-text' => 'Select the topic areas below in which you have formal expertise or would like to do the most work in.', |
| 33 | 33 | 'requestaccount-ext-text' => 'The following information is kept private and will only be used for this request. |
| 34 | 34 | You may want to list contacts such a phone number to aid in identify confirmation.', |
| 35 | | - 'requestaccount-bio-text' => "Your biography will be set as the default content for your userpage. |
| 36 | | -Try to include any credentials. |
| 37 | | -Make sure you are comfortable publishing such information. |
| 38 | | -Your name can be changed via [[Special:Preferences|your preferences]].", |
| | 35 | + 'requestaccount-bio-text' => "Try to include any relevant credentials in your biography below.", |
| | 36 | + 'requestaccount-bio-text-i' => "'''Your biography will be set as the initial content for your userpage.''' |
| | 37 | +Make sure you are comfortable publishing such information.", |
| 39 | 38 | 'requestaccount-real' => 'Real name:', |
| 40 | | - 'requestaccount-same' => '(same as real name)', |
| | 39 | + 'requestaccount-same' => '(same as real name below)', |
| 41 | 40 | 'requestaccount-email' => 'E-mail address:', |
| 42 | 41 | 'requestaccount-reqtype' => 'Position:', |
| 43 | 42 | 'requestaccount-level-0' => 'author', |
| 44 | 43 | 'requestaccount-level-1' => 'editor', |
| 45 | 44 | 'requestaccount-info' => '(?)', |
| 46 | | - 'requestaccount-bio' => 'Personal biography:', |
| | 45 | + 'requestaccount-bio' => 'Personal biography (plain text only):', |
| 47 | 46 | 'requestaccount-attach' => 'Resume or CV (optional):', |
| 48 | 47 | 'requestaccount-notes' => 'Additional notes:', |
| 49 | | - 'requestaccount-urls' => 'List of websites, if any (separate with newlines):', |
| | 48 | + 'requestaccount-urls' => 'List of websites, if any (each on a separate line):', |
| 50 | 49 | 'requestaccount-agree' => 'You must certify that your real name is correct and that you agree to our Terms of Service.', |
| 51 | 50 | 'requestaccount-inuse' => 'Username is already in use in a pending account request.', |
| 52 | 51 | 'requestaccount-tooshort' => 'Your biography must be at least $1 {{PLURAL:$1|word|words}} long.', |