summaryrefslogtreecommitdiffstats
path: root/template/en/default/account
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/account
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/account')
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl2
-rw-r--r--template/en/default/account/email/change-new.txt.tmpl2
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl2
-rw-r--r--template/en/default/account/email/request-new.txt.tmpl2
-rw-r--r--template/en/default/account/password/forgotten-password.txt.tmpl2
5 files changed, 5 insertions, 5 deletions
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