mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00
Code Issues Releases Wiki Activity

#1232

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5719 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-03-25 15:46:20 +00:00
parent 384e434fca
commit 5d2bba8e70
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/acp/acp_email.php
View File

@ -185,7 +185,15 @@ class acp_email
}
add_log('admin', 'LOG_MASS_EMAIL', $group_name);
$message = (!$errored) ? $user->lang['EMAIL_SENT'] : sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="' . $phpbb_admin_path . "index.$phpEx$SID&amp;i=logs&amp;mode=critical" . '">', '</a>');
if (!$errored)
{
$message = ($use_queue) ? $user->lang['EMAIL_SENT_QUEUE'] : $user->lang['EMAIL_SENT'];
}
else
{
$message = sprintf($user->lang['EMAIL_SEND_ERROR'], '<a href="' . $phpbb_admin_path . "index.$phpEx$SID&amp;i=logs&amp;mode=critical" . '">', '</a>');
}
trigger_error($message . adm_back_link($this->u_action));
}
}

3
phpBB/language/en/acp/email.php
View File

@ -36,7 +36,8 @@ $lang = array_merge($lang, array(
'COMPOSE' => 'Compose',
'EMAIL_SEND_ERROR' => 'There were one or more errors while sending the email. Please check the %sError Log%s for detailed error messages.',
'EMAIL_SENT' => 'Your message has been queued for sending.',
'EMAIL_SENT' => 'Your message has been sent.',
'EMAIL_SENT_QUEUE' => 'Your message has been queued for sending.',
'LOG_SESSION' => 'Log mail session to critical log',