a few fixes

This commit is contained in:
Jacob G 2015-01-11 16:56:50 -05:00
parent 823ecff1c4
commit 1f8d97bbaf
3 changed files with 5 additions and 5 deletions

View file

@ -122,7 +122,7 @@ class AccountConfirmSubmission {
} }
# Send out a request hold email... # Send out a request hold email...
$result = $u->sendMail( /*$result = $u->sendMail(
$context->msg( 'confirmaccount-email-subj' )->inContentLanguage()->text(), $context->msg( 'confirmaccount-email-subj' )->inContentLanguage()->text(),
$context->msg( 'confirmaccount-email-body5', $u->getName(), $this->reason )->inContentLanguage()->text() $context->msg( 'confirmaccount-email-body5', $u->getName(), $this->reason )->inContentLanguage()->text()
); );
@ -130,7 +130,7 @@ class AccountConfirmSubmission {
$dbw->rollback(); $dbw->rollback();
return array( 'accountconf_mailerror', return array( 'accountconf_mailerror',
$context->msg( 'mailerror' )->rawParams( $context->getOutput()->parse( $result->getWikiText() ) )->text() ); $context->msg( 'mailerror' )->rawParams( $context->getOutput()->parse( $result->getWikiText() ) )->text() );
} }*/
# Clear cache for notice of how many account requests there are # Clear cache for notice of how many account requests there are
ConfirmAccount::clearAccountRequestCountCache(); ConfirmAccount::clearAccountRequestCountCache();

View file

@ -72,7 +72,7 @@ You cannot make any more requests.",
//Scratch-specific stuff //Scratch-specific stuff
'requestaccount-user-verification' => 'User verification', 'requestaccount-user-verification' => 'User verification',
'requestaccount-code-troubleshoot' => '\'\'\'Note:\'\'\' If you are having problems with User verification not working, please see our [http://wiki.scratch.mit.edu/wiki/Scratch_Wiki:Become_a_contributor/Verification_code_troubleshooting troubleshooting page]', 'requestaccount-code-troubleshoot' => '\'\'\'Note:\'\'\' If you are having problems with user verification not working, please see our [[Scratch_Wiki:Become a contributor/Verification code troubleshooting|troubleshooting page]]',
'requestaccount-set-pwd' => 'Set password', 'requestaccount-set-pwd' => 'Set password',
'requestaccount-project-info' => 'Please go to the [$1 user verification project] and comment the following code:<br />\'\'\'$2\'\'\'', 'requestaccount-project-info' => 'Please go to the [$1 user verification project] and comment the following code:<br />\'\'\'$2\'\'\'',
'requestaccount-project-link' => 'http://scratch.mit.edu/projects/10135908/' 'requestaccount-project-link' => 'http://scratch.mit.edu/projects/10135908/'

View file

@ -221,11 +221,11 @@ class RequestAccountPage extends SpecialPage {
$form .= '<legend>' . $this->msg('requestaccount-set-pwd') . '</legend>'; $form .= '<legend>' . $this->msg('requestaccount-set-pwd') . '</legend>';
$form .= '<table border="0"> $form .= '<table border="0">
<tr> <tr>
<td>Password</td> <td>' . $this->msg('createacct-yourpassword-ph') . '</td>
<td><input type="password" name="pwd1" /></td> <td><input type="password" name="pwd1" /></td>
</tr> </tr>
<tr> <tr>
<td>Confirm password</td> <td>' . $this->msg('createacct-yourpasswordagain') . '</td>
<td><input type="password" name="pwd2" /></td> <td><input type="password" name="pwd2" /></td>
</tr> </tr>
</table>' . "\n"; </table>' . "\n";