From 5d2bba8e7050eda4c32be610982f80a9fec2e6c3 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 25 Mar 2006 15:46:20 +0000
Subject: [PATCH] #1232

git-svn-id: file:///svn/phpbb/trunk@5719 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_email.php | 10 +++++++++-
 phpBB/language/en/acp/email.php  |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 03ed3b4696..bedab7ea20 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -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));
 			}
 		}
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 709d51b7e9..c72bdbcb68 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -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',