makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID

Browse source 
PHPBB3-10896
This commit is contained in:
Nathan Guse 2013-02-04 23:13:47 -06:00
parent 293b65e3ef
commit 5aec7600a6
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/index.php
View file

@ -452,7 +452,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
case 'email': case 'email':
if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name])) if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name]))
{ {
$error[] = $user->lang['EMAIL_INVALID']; $error[] = $user->lang['EMAIL_INVALID_EMAIL'];
} }
break; break;

2
phpBB/language/en/common.php
View file

@ -160,7 +160,7 @@ $lang = array_merge($lang, array(
'EDIT_POST' => 'Edit post', 'EDIT_POST' => 'Edit post',
'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS
'EMAIL_ADDRESS' => 'E-mail 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.', '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_SUBJECT' => 'You must specify a subject when posting a new topic.',
'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.',

1
phpBB/language/en/ucp.php
View file

@ -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.', '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_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_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.', 'EMAIL_TAKEN_EMAIL' => 'The entered e-mail address is already in use.',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes.', 'EMPTY_DRAFT' => 'You must enter a message to submit your changes.',