summaryrefslogtreecommitdiffstats
path: root/extensions
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 /extensions
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 'extensions')
-rw-r--r--extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl2
-rw-r--r--extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl2
-rw-r--r--extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl2
-rw-r--r--extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl2
4 files changed, 4 insertions, 4 deletions
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
index 8ad9d6cb1..e85c76efd 100644
--- a/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
+++ b/extensions/RequestNagger/template/en/default/email/request_nagging-requestee-header.txt.tmpl
@@ -8,7 +8,7 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS "global/reason-descs.none.tmpl" %]
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% recipient.email %]
Subject: [[% terms.Bugzilla %]] Your Overdue Requests
([% FOREACH type = requests.item(recipient.email).typelist %]
diff --git a/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl b/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
index 261e92f13..b7ea261c6 100644
--- a/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
+++ b/extensions/RequestNagger/template/en/default/email/request_nagging-watching-header.txt.tmpl
@@ -8,7 +8,7 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS "global/reason-descs.none.tmpl" %]
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% recipient.email %]
Subject: [[% terms.Bugzilla %]] Overdue Requests Report
Date: [% date %]
diff --git a/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl b/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
index e4f4c9242..7298e686e 100644
--- a/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
+++ b/extensions/SecureMail/template/en/default/account/email/securemail-test.txt.tmpl
@@ -8,7 +8,7 @@
[% PROCESS global/variables.none.tmpl %]
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% to_user %]
Subject: [% terms.Bugzilla %] SecureMail Test Email
X-Bugzilla-Type: securemail-test
diff --git a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
index bfb37c90d..2e1de2a5c 100644
--- a/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
+++ b/extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl
@@ -20,7 +20,7 @@
[% PROCESS global/variables.none.tmpl %]
-From: [% Param('mailfrom') %]
+From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]>
To: [% to %]
Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.
X-Bugzilla-Type: voteremoved