From 2e6259f35fe526887d8e5bd50502bd43b88ec16a Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Wed, 27 Feb 2013 12:50:47 +0100
Subject: [PATCH] (bug 45461) Use email instead of e-mail

Change-Id: Ibad4c4c7c98f5b0c746d62f1b2b41a4a99360ee8
---
 EmailBlacklist.php     |  6 +++---
 SpamBlacklist.i18n.php | 12 ++++++------
 SpamBlacklistHooks.php |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/EmailBlacklist.php b/EmailBlacklist.php
index 8eb49afc..9266b2e4 100644
--- a/EmailBlacklist.php
+++ b/EmailBlacklist.php
@@ -15,7 +15,7 @@ class EmailBlacklist extends BaseBlacklist {
 	}
 
 	/**
-	 * Checks a User object for a blacklisted e-mail address
+	 * Checks a User object for a blacklisted email address
 	 *
 	 * @param User $user
 	 * @return bool True on valid email
@@ -32,9 +32,9 @@ class EmailBlacklist extends BaseBlacklist {
 			return true;
 		}
 
-		// Check for whitelisted e-mail addresses
+		// Check for whitelisted email addresses
 		if ( is_array( $whitelists ) ) {
-			wfDebugLog( 'SpamBlacklist', "Excluding whitelisted e-mail addresses from " . count( $whitelists ) .
+			wfDebugLog( 'SpamBlacklist', "Excluding whitelisted email addresses from " . count( $whitelists ) .
 				" regexes: " . implode( ', ', $whitelists ) . "\n" );
 			foreach ( $whitelists as $regex ) {
 				if ( preg_match( $regex, $email ) )  {
diff --git a/SpamBlacklist.i18n.php b/SpamBlacklist.i18n.php
index 7dd66a33..b0930b9d 100644
--- a/SpamBlacklist.i18n.php
+++ b/SpamBlacklist.i18n.php
@@ -29,13 +29,13 @@ $messages['en'] = array(
 
  #</pre> <!-- leave this line exactly as it is -->',
 	'email-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
-# E-mail addresses matching this list will be blocked from registering or sending e-mails
+# Email addresses matching this list will be blocked from registering or sending emails
 # This list affects only this wiki; refer also to the global blacklist.
 # For documentation see https://www.mediawiki.org/wiki/Extension:SpamBlacklist
 #
 # Syntax is as follows:
 #   * Everything from a "#" character to the end of the line is a comment
-#   * Every non-blank line is a regex fragment which will only match hosts inside e-mail addresses
+#   * Every non-blank line is a regex fragment which will only match hosts inside email addresses
 
  #</pre> <!-- leave this line exactly as it is -->',
 	'email-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
@@ -44,13 +44,13 @@ $messages['en'] = array(
 #
 # Syntax is as follows:
 #   * Everything from a "#" character to the end of the line is a comment
-#   * Every non-blank line is a regex fragment which will only match hosts inside e-mail addresses
+#   * Every non-blank line is a regex fragment which will only match hosts inside email addresses
 
  #</pre> <!-- leave this line exactly as it is -->',
 
-	'spam-blacklisted-email' => 'Blacklisted e-mail address',
-	'spam-blacklisted-email-text' => 'Your e-mail address is currently blacklisted from sending e-mails to other users.',
-	'spam-blacklisted-email-signup' => 'The given e-mail address is currently blacklisted from use.',
+	'spam-blacklisted-email' => 'Blacklisted email address',
+	'spam-blacklisted-email-text' => 'Your email address is currently blacklisted from sending emails to other users.',
+	'spam-blacklisted-email-signup' => 'The given email address is currently blacklisted from use.',
 
 	'spam-invalid-lines' =>	"The following spam blacklist {{PLURAL:$1|line is an|lines are}} invalid regular {{PLURAL:$1|expression|expressions}} and {{PLURAL:$1|needs|need}} to be corrected before saving the page:",
 	'spam-blacklist-desc' => 'Regex-based anti-spam tool: [[MediaWiki:Spam-blacklist]] and [[MediaWiki:Spam-whitelist]]',
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index 5597ab25..530df16a 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -70,7 +70,7 @@ class SpamBlacklistHooks {
 	}
 
 	/**
-	 * Processes new accounts for valid e-mail addresses
+	 * Processes new accounts for valid email addresses
 	 *
 	 * @param $user User
 	 * @param $abortError