From 1f8d97bbaf510e447ab6c74e81611f09ff9c0425 Mon Sep 17 00:00:00 2001
From: Jacob G <jacob-x@jvvgindustries.com>
Date: Sun, 11 Jan 2015 16:56:50 -0500
Subject: [PATCH] a few fixes

---
 ConfirmAccount/business/AccountConfirmSubmission.php          | 4 ++--
 ConfirmAccount/frontend/language/RequestAccountPage.i18n.php  | 2 +-
 .../frontend/specialpages/actions/RequestAccount_body.php     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ConfirmAccount/business/AccountConfirmSubmission.php b/ConfirmAccount/business/AccountConfirmSubmission.php
index 16226ef..29d4d4d 100644
--- a/ConfirmAccount/business/AccountConfirmSubmission.php
+++ b/ConfirmAccount/business/AccountConfirmSubmission.php
@@ -122,7 +122,7 @@ class AccountConfirmSubmission {
 		}
 
 		# Send out a request hold email...
-		$result = $u->sendMail(
+		/*$result = $u->sendMail(
 			$context->msg( 'confirmaccount-email-subj' )->inContentLanguage()->text(),
 			$context->msg( 'confirmaccount-email-body5', $u->getName(), $this->reason )->inContentLanguage()->text()
 		);
@@ -130,7 +130,7 @@ class AccountConfirmSubmission {
 			$dbw->rollback();
 			return array( 'accountconf_mailerror',
 				$context->msg( 'mailerror' )->rawParams( $context->getOutput()->parse( $result->getWikiText() ) )->text() );
-		}
+		}*/
 
 		# Clear cache for notice of how many account requests there are
 		ConfirmAccount::clearAccountRequestCountCache();
diff --git a/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php b/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php
index 81e3fee..648bb06 100644
--- a/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php
+++ b/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php
@@ -72,7 +72,7 @@ You cannot make any more requests.",
 
 	//Scratch-specific stuff
 	'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-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/'
diff --git a/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php b/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php
index 0c91ada..1e50b97 100644
--- a/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php
+++ b/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php
@@ -221,11 +221,11 @@ class RequestAccountPage extends SpecialPage {
 		$form .= '<legend>' . $this->msg('requestaccount-set-pwd') . '</legend>';
 		$form .= '<table border="0">
 			<tr>
-				<td>Password</td>
+				<td>' . $this->msg('createacct-yourpassword-ph') . '</td>
 				<td><input type="password" name="pwd1" /></td>
 			</tr>
 			<tr>
-				<td>Confirm password</td>
+				<td>' . $this->msg('createacct-yourpasswordagain') . '</td>
 				<td><input type="password" name="pwd2" /></td>
 			</tr>
 		</table>' . "\n";