From 394a014b635238518511e1c86ecdbdbe70593c5c Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Fri, 3 Nov 2006 07:31:59 +0000
Subject: Bug 353711: Move to Email:: modules for email sending Patch By Max
 Kanat-Alexander <mkanat@bugzilla.org> r=glob, a=myk

---
 template/en/default/admin/params/mta.html.tmpl  | 7 +++----
 template/en/default/global/code-error.html.tmpl | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'template')

diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index 4089820b5..224d21544 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -28,14 +28,13 @@
   mail_delivery_method => "Defines how email is sent, or if it is sent at all.<br>
                            <ul>
                              <li>
-                               'sendmail', 'smtp' and 'qmail' are all MTAs.
+                               'Sendmail', 'SMTP' and 'Qmail' are all MTAs.
                                You need to install a third-party sendmail replacement if
                                you want to use sendmail on Windows.
                              </li>
                              <li>
-                               'testfile' is useful for debugging: all email is stored
-                               in 'data/mailer.testfile' instead of being sent. For more
-                               information, see the Mail::Mailer manual.
+                               'Test' is useful for debugging: all email is stored
+                               in 'data/mailer.testfile' instead of being sent.
                              </li>
                              <li>
                                'none' will completely disable email. $terms.Bugzilla continues
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index f6ccae754..a0e9bd9b9 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -295,6 +295,11 @@
   [% ELSIF error == "ldap_server_not_defined" %]
     The LDAP server for authentication has not been defined.
 
+  [% ELSIF error == "mail_send_error" %]
+    There was an error sending mail from '[% mail.header('From') FILTER html %]'
+    to '[% mail.header('To') FILTER html %]':
+    [% msg FILTER html %]
+
   [% ELSIF error == "missing_bug_id" %]
     No [% terms.bug %] ID was given.
     
-- 
cgit v1.2.3-24-g4f1b