aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/adm/index.php2
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/ucp.php1
3 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 2da8a130cc..85908476a1 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -452,7 +452,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
case 'email':
if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name]))
{
- $error[] = $user->lang['EMAIL_INVALID'];
+ $error[] = $user->lang['EMAIL_INVALID_EMAIL'];
}
break;
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9f8799b6d6..6dd390ed24 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -160,7 +160,7 @@ $lang = array_merge($lang, array(
'EDIT_POST' => 'Edit post',
'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS
'EMAIL_ADDRESS' => 'E-mail address',
- 'EMAIL_INVALID' => 'The email address you entered is invalid.',
+ 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.',
'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.',
'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 5152c4b50b..0dce2961e5 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -176,7 +176,6 @@ $lang = array_merge($lang, array(
'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
'EMAIL_BANNED_EMAIL' => 'The e-mail address you entered is not allowed to be used.',
- 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.',
'EMAIL_REMIND' => 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
'EMAIL_TAKEN_EMAIL' => 'The entered e-mail address is already in use.',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes.',