summaryrefslogtreecommitdiffstats
path: root/template/en/default/email
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-05-16 07:22:10 +0200
committerByron Jones <glob@mozilla.com>2014-05-16 07:22:10 +0200
commit3f35dd081156d231710553099f01f40481aa187a (patch)
tree3fbb3d13e2f76dacb20c9fa8decd645366fbedd1 /template/en/default/email
parent6c7add0ece060f9a945c7b18b4d03546a2220043 (diff)
downloadbugzilla-3f35dd081156d231710553099f01f40481aa187a.tar.gz
bugzilla-3f35dd081156d231710553099f01f40481aa187a.tar.xz
Bug 1010751: Add "Bugzilla@Mozilla" to the From header, so email clients don't just display "bugzilla-daemon@mozilla.org"
Diffstat (limited to 'template/en/default/email')
-rw-r--r--template/en/default/email/lockout.txt.tmpl2
-rw-r--r--template/en/default/email/sanitycheck.txt.tmpl2
-rw-r--r--template/en/default/email/sudo.txt.tmpl2
-rw-r--r--template/en/default/email/whine.txt.tmpl2
4 files changed, 4 insertions, 4 deletions
diff --git a/template/en/default/email/lockout.txt.tmpl b/template/en/default/email/lockout.txt.tmpl
index 94e9c74cb..daad4eb98 100644
--- a/template/en/default/email/lockout.txt.tmpl
+++ b/template/en/default/email/lockout.txt.tmpl
@@ -20,7 +20,7 @@
[% PROCESS global/variables.none.tmpl %]
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% Param('maintainer') %]
Subject: [[% terms.Bugzilla %]] Account Lock-Out: [% locked_user.login %] ([% address %])
X-Bugzilla-Type: admin
diff --git a/template/en/default/email/sanitycheck.txt.tmpl b/template/en/default/email/sanitycheck.txt.tmpl
index 8826d4e39..a14489f73 100644
--- a/template/en/default/email/sanitycheck.txt.tmpl
+++ b/template/en/default/email/sanitycheck.txt.tmpl
@@ -19,7 +19,7 @@
#%]
[% PROCESS "global/variables.none.tmpl" %]
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% addressee %]
Subject: [[% terms.Bugzilla %]] Sanity Check Results
X-Bugzilla-Type: sanitycheck
diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl
index 74fbc4976..a75e03889 100644
--- a/template/en/default/email/sudo.txt.tmpl
+++ b/template/en/default/email/sudo.txt.tmpl
@@ -21,7 +21,7 @@
[% PROCESS global/variables.none.tmpl %]
Content-Type: text/plain
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% user.email %]
Subject: [[% terms.Bugzilla %]] Your account [% user.login -%]
is being impersonated
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index 32d8da8a0..b249d1964 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -19,7 +19,7 @@
#%]
[% PROCESS "global/field-descs.none.tmpl" %]
-From: [% Param("mailfrom") %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% email %][% Param("emailsuffix") %]
Subject: Your [% terms.Bugzilla %] [%+ terms.bug %] list needs attention.
X-Bugzilla-Type: whine