From 3f35dd081156d231710553099f01f40481aa187a Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Fri, 16 May 2014 13:22:10 +0800 Subject: Bug 1010751: Add "Bugzilla@Mozilla" to the From header, so email clients don't just display "bugzilla-daemon@mozilla.org" --- .../template/en/default/email/request_nagging-requestee-header.txt.tmpl | 2 +- .../template/en/default/email/request_nagging-watching-header.txt.tmpl | 2 +- .../template/en/default/account/email/securemail-test.txt.tmpl | 2 +- extensions/Voting/template/en/default/voting/votes-removed.txt.tmpl | 2 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/account/email/change-new.txt.tmpl | 2 +- template/en/default/account/email/change-old.txt.tmpl | 2 +- template/en/default/account/email/request-new.txt.tmpl | 2 +- template/en/default/account/password/forgotten-password.txt.tmpl | 2 +- template/en/default/email/lockout.txt.tmpl | 2 +- template/en/default/email/sanitycheck.txt.tmpl | 2 +- template/en/default/email/sudo.txt.tmpl | 2 +- template/en/default/email/whine.txt.tmpl | 2 +- template/en/default/request/email.txt.tmpl | 2 +- 14 files changed, 14 insertions(+), 14 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 diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index 6619dedd3..c3b6012a6 100644 --- a/template/en/default/account/cancel-token.txt.tmpl +++ b/template/en/default/account/cancel-token.txt.tmpl @@ -21,7 +21,7 @@ [% PROCESS global/variables.none.tmpl %] -From: [% Param('mailfrom') %] +From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]> To: [% emailaddress %] Subject: [% PROCESS subject %] X-Bugzilla-Type: admin diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index b40ab9852..eeedaf07b 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -20,7 +20,7 @@ [% PROCESS global/variables.none.tmpl %] -From: [% Param('mailfrom') %] +From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]> To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Email Address Request X-Bugzilla-Type: admin diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index ee66c0f24..db08ecba9 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -25,7 +25,7 @@ [% PROCESS global/variables.none.tmpl %] -From: [% Param('mailfrom') %] +From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]> To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Email Address Request Importance: High diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 8fb36926f..fd20d08c6 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -21,7 +21,7 @@ [% PROCESS global/variables.none.tmpl %] -From: [% Param('mailfrom') %] +From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]> To: [% email %] Subject: [% terms.Bugzilla %]: confirm account creation X-Bugzilla-Type: admin diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index e014658dc..1c80d0934 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -20,7 +20,7 @@ [% PROCESS global/variables.none.tmpl %] -From: [% Param('mailfrom') %] +From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]> To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Password Request X-Bugzilla-Type: admin 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 diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 17ab12431..ba263fe7d 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -47,7 +47,7 @@ [% END %] [% subject_status = statuses.$action %] [% END %] -From: [% Param('mailfrom') %] +From: "[% terms.BugzillaTitle %]" <[% Param('mailfrom') %]> To: [% to %] Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %] [%- IF attachment %] : -- cgit v1.2.3-24-g4f1b