summaryrefslogtreecommitdiffstats
path: root/extensions/BMO/template
diff options
context:
space:
mode:
authorByron Jones ‹:glob› <glob@mozilla.com>2014-09-26 22:43:14 +0200
committerDavid Lawrence <dkl@mozilla.com>2014-09-26 22:43:14 +0200
commit9552ab99622d784611d254268d3688558d24fe6e (patch)
tree8daf986771e1f5e0ba17f18a930cb60d5d74efde /extensions/BMO/template
parent66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf (diff)
downloadbugzilla-9552ab99622d784611d254268d3688558d24fe6e.tar.gz
bugzilla-9552ab99622d784611d254268d3688558d24fe6e.tar.xz
Bug 1035972: add preference to include all X-Headers in email bodies to allow gmail to filter on them
Diffstat (limited to 'extensions/BMO/template')
-rw-r--r--extensions/BMO/template/en/default/email/bugmail.html.tmpl1
-rw-r--r--extensions/BMO/template/en/default/email/bugmail.txt.tmpl2
-rw-r--r--extensions/BMO/template/en/default/hook/global/setting-descs-settings.none.tmpl11
3 files changed, 13 insertions, 1 deletions
diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index a6d2b340c..7a628ec7f 100644
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -111,6 +111,7 @@
</ul>
</div>
+ @@body-headers@@
</body>
</html>
diff --git a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl
index b0e8636a4..9cb020b02 100644
--- a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl
@@ -61,6 +61,8 @@ Product/Component: [%+ bug.product +%] :: [%+ bug.component %]
[% END %]
[%+ reason_lines.join("\n") %]
+@@body-headers@@
+
[% BLOCK generate_diffs %]
[% urlbase %]show_bug.cgi?id=[% bug.id %]
diff --git a/extensions/BMO/template/en/default/hook/global/setting-descs-settings.none.tmpl b/extensions/BMO/template/en/default/hook/global/setting-descs-settings.none.tmpl
index 666621d8b..57e20108d 100644
--- a/extensions/BMO/template/en/default/hook/global/setting-descs-settings.none.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/setting-descs-settings.none.tmpl
@@ -1,5 +1,14 @@
-[%
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[%
setting_descs.product_chooser = "Product chooser to use when entering bugs",
setting_descs.pretty_product_chooser = "Pretty chooser with common products and icons",
setting_descs.full_product_chooser = "Full chooser with all products",
+ setting_descs.headers_in_body = "Include X-Bugzilla- headers in BugMail body",
%]