summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2006-11-03 08:31:59 +0100
committermkanat%bugzilla.org <>2006-11-03 08:31:59 +0100
commit394a014b635238518511e1c86ecdbdbe70593c5c (patch)
treec57be0489271f2a84bcf3eabfbc26bdaae32e8c9 /template/en/default
parentc387f4db6121b465c4d10035d8082eee3c016ef0 (diff)
downloadbugzilla-394a014b635238518511e1c86ecdbdbe70593c5c.tar.gz
bugzilla-394a014b635238518511e1c86ecdbdbe70593c5c.tar.xz
Bug 353711: Move to Email:: modules for email sending
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=glob, a=myk
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/params/mta.html.tmpl7
-rw-r--r--template/en/default/global/code-error.html.tmpl5
2 files changed, 8 insertions, 4 deletions
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.