| Index: trunk/extensions/SpamBlacklist/SpamBlacklistHooks.php |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | | - * Processes new accounts for valid emails |
| | 80 | + * Processes new accounts for valid e-mail addresses |
| 81 | 81 | * |
| 82 | 82 | * @param $user User |
| 83 | 83 | * @param $abortError |
| Index: trunk/extensions/SpamBlacklist/EmailBlacklist.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | | - * Checks a User object for a blacklisted email |
| | 19 | + * Checks a User object for a blacklisted e-mail address |
| 20 | 20 | * |
| 21 | 21 | * @param User $user |
| 22 | 22 | * @return bool True on valid email |
| — | — | @@ -32,9 +32,9 @@ |
| 33 | 33 | return true; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | | - // Check for whitelisted emails |
| | 36 | + // Check for whitelisted e-mail addresses |
| 37 | 37 | if ( is_array( $whitelists ) ) { |
| 38 | | - wfDebugLog( 'SpamBlacklist', "Excluding whitelisted emails from " . count( $whitelists ) . |
| | 38 | + wfDebugLog( 'SpamBlacklist', "Excluding whitelisted e-mail addresses from " . count( $whitelists ) . |
| 39 | 39 | " regexes: " . implode( ', ', $whitelists ) . "\n" ); |
| 40 | 40 | foreach ( $whitelists as $regex ) { |
| 41 | 41 | if ( preg_match( $regex, $email ) ) { |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | # Do the match |
| 50 | | - wfDebugLog( 'SpamBlacklist', "Checking email against " . count( $blacklists ) . |
| | 50 | + wfDebugLog( 'SpamBlacklist', "Checking e-mail address against " . count( $blacklists ) . |
| 51 | 51 | " regexes: " . implode( ', ', $blacklists ) . "\n" ); |
| 52 | 52 | foreach ( $blacklists as $regex ) { |
| 53 | 53 | if ( preg_match( $regex, $email ) ) { |
| Index: trunk/extensions/SpamBlacklist/SpamBlacklist.i18n.php |
| — | — | @@ -24,28 +24,28 @@ |
| 25 | 25 | # have been blocked by blacklist entries. |
| 26 | 26 | # |
| 27 | 27 | #</pre> <!-- leave this line exactly as it is -->', |
| 28 | | - 'email-blacklist' => ' # Emails matching this list will be blocked from registering or sending email |
| | 28 | + 'email-blacklist' => ' # E-mail addresses matching this list will be blocked from registering or sending e-mails |
| 29 | 29 | # This list affects only this wiki; refer also to the global blacklist. |
| 30 | 30 | # For documentation see https://www.mediawiki.org/wiki/Extension:SpamBlacklist |
| 31 | 31 | #<!-- leave this line exactly as it is --> <pre> |
| 32 | 32 | # |
| 33 | 33 | # Syntax is as follows: |
| 34 | 34 | # * Everything from a "#" character to the end of the line is a comment |
| 35 | | -# * Every non-blank line is a regex fragment which will only match hosts inside e-mails |
| | 35 | +# * Every non-blank line is a regex fragment which will only match hosts inside e-mail addresses |
| 36 | 36 | |
| 37 | 37 | #</pre> <!-- leave this line exactly as it is -->', |
| 38 | 38 | 'email-whitelist' => ' #<!-- leave this line exactly as it is --> <pre> |
| 39 | | -# Emails matching this list will *not* be blocked even if they would |
| | 39 | +# Email addresses matching this list will *not* be blocked even if they would |
| 40 | 40 | # have been blocked by blacklist entries. |
| 41 | 41 | # |
| 42 | 42 | #</pre> <!-- leave this line exactly as it is --> |
| 43 | 43 | # Syntax is as follows: |
| 44 | 44 | # * Everything from a "#" character to the end of the line is a comment |
| 45 | | -# * Every non-blank line is a regex fragment which will only match hosts inside e-mails', |
| | 45 | +# * Every non-blank line is a regex fragment which will only match hosts inside e-mail addresses', |
| 46 | 46 | |
| 47 | | - 'spam-blacklisted-email' => 'Blacklisted E-mail', |
| | 47 | + 'spam-blacklisted-email' => 'Blacklisted e-mail address', |
| 48 | 48 | 'spam-blacklisted-email-text' => 'Your e-mail address is currently blacklisted from sending e-mails to other users.', |
| 49 | | - 'spam-blacklisted-email-signup' => 'The e-mail address given is currently blacklisted from use.', |
| | 49 | + 'spam-blacklisted-email-signup' => 'The given e-mail address is currently blacklisted from use.', |
| 50 | 50 | |
| 51 | 51 | '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:", |
| 52 | 52 | 'spam-blacklist-desc' => 'Regex-based anti-spam tool: [[MediaWiki:Spam-blacklist]] and [[MediaWiki:Spam-whitelist]]', |