From 2f103ae97233436641fecc66ac74de6b66413c58 Mon Sep 17 00:00:00 2001
From: Jacob G <jacob-x@jvvgindustries.com>
Date: Mon, 12 Jan 2015 20:44:33 -0500
Subject: [PATCH] notifications show on recent changes and watchlist pages

---
 ConfirmAccount/frontend/ConfirmAccountUI.hooks.php           | 2 +-
 ConfirmAccount/frontend/language/ConfirmAccount.i18n.php     | 2 +-
 ConfirmAccount/frontend/language/RequestAccountPage.i18n.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ConfirmAccount/frontend/ConfirmAccountUI.hooks.php b/ConfirmAccount/frontend/ConfirmAccountUI.hooks.php
index 7999da0..fffa883 100644
--- a/ConfirmAccount/frontend/ConfirmAccountUI.hooks.php
+++ b/ConfirmAccount/frontend/ConfirmAccountUI.hooks.php
@@ -64,7 +64,7 @@ class ConfirmAccountUIHooks {
 		if ( !$title->isSpecial( 'Recentchanges' ) && !$title->isSpecial( 'Watchlist' ) ) {
 			return true;
 		}
-		$count = ConfirmAccount::getOpenEmailConfirmedCount( '*' );
+		$count = ConfirmAccount::getOpenRequestCount( '*' );
 		if ( $count > 0 ) {
 			$out->prependHtml(
 				'<div id="mw-confirmaccount-msg" class="plainlinks mw-confirmaccount-bar">' .
diff --git a/ConfirmAccount/frontend/language/ConfirmAccount.i18n.php b/ConfirmAccount/frontend/language/ConfirmAccount.i18n.php
index ae1b72b..1426a36 100644
--- a/ConfirmAccount/frontend/language/ConfirmAccount.i18n.php
+++ b/ConfirmAccount/frontend/language/ConfirmAccount.i18n.php
@@ -10,7 +10,7 @@ $messages = array();
 
 $messages['en'] = array(
 	# Site message for admins
-	'confirmaccount-newrequests' => '\'\'\'$1\'\'\' open e-mail confirmed [[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are pending}}]]. \'\'\'Your attention is needed!\'\'\'',
+	'confirmaccount-newrequests' => '\'\'\'$1\'\'\' open [[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are pending}}]]. \'\'\'Your attention is needed!\'\'\'',
 
 	# Add to Special:Login
 	'requestaccount-loginnotice' => 'To obtain a user account, you must \'\'\'[[Special:RequestAccount|request one]]\'\'\'.',
diff --git a/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php b/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php
index 8d3c7a0..cb74774 100644
--- a/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php
+++ b/ConfirmAccount/frontend/language/RequestAccountPage.i18n.php
@@ -23,7 +23,7 @@ Once the account is approved, a Wiki administrator will comment on one of your p
 	'requestaccount-leg-person' => 'Personal information',
 	'requestaccount-leg-other'  => 'Other information',
 	'requestaccount-leg-tos'    => 'Terms of Service',
-	'requestaccount-acc-text'   => 'Please enter your Scratch username. Please note that this IS case-sensitive.',
+	'requestaccount-acc-text'   => 'When your account is created, you will be notified via a comment on your profile whether your request was accepted or rejected. Please try to remember the password you set (if in doubt set it to the same thing as your Scratch password). Please note that nobody can see your password.',
 	'requestaccount-areas' 		=> '', # Do not translate this message to other languages
 	'requestaccount-areas-text' => 'Select the topic areas below in which you have formal expertise or would like to do the most work in.',
 	'requestaccount-ext-text'   => 'The following information is kept private and will only be used for this request.',