From fedc614940493768c53791939065fcf72ac5414b Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Mon, 31 Aug 2015 12:20:49 +0800
Subject: Bug 714724 - correctly encode emails as quoted-printable
 r=LpSolit,a=sgreen

---
 template/en/default/whine/header.txt.tmpl         | 19 +++++++++++
 template/en/default/whine/multipart-mime.txt.tmpl | 39 -----------------------
 2 files changed, 19 insertions(+), 39 deletions(-)
 create mode 100644 template/en/default/whine/header.txt.tmpl
 delete mode 100644 template/en/default/whine/multipart-mime.txt.tmpl

(limited to 'template/en/default/whine')

diff --git a/template/en/default/whine/header.txt.tmpl b/template/en/default/whine/header.txt.tmpl
new file mode 100644
index 000000000..4067964f2
--- /dev/null
+++ b/template/en/default/whine/header.txt.tmpl
@@ -0,0 +1,19 @@
+[%# 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.
+  #%]
+
+[%# INTERFACE:
+  # subject: subject line of message
+  # recipient: user object for the intended recipient of the message
+  # from: Bugzilla system email address
+  #%]
+
+From: [% from %]
+To: [% recipient.email %]
+Subject: [[% terms.Bugzilla %]] [% subject %]
+X-Bugzilla-Type: whine
+
diff --git a/template/en/default/whine/multipart-mime.txt.tmpl b/template/en/default/whine/multipart-mime.txt.tmpl
deleted file mode 100644
index d28f4cea6..000000000
--- a/template/en/default/whine/multipart-mime.txt.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-[%# 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.
-  #%]
-
-[%# INTERFACE:
-  # subject: subject line of message
-  # alternatives: array of hashes containing:
-  #     type: MIME type
-  #     content: verbatim content
-  # boundary: a string that has been generated to be a unique boundary
-  # recipient: user object for the intended recipient of the message
-  # from: Bugzilla system email address
-  #%]
-
-From: [% from %]
-To: [% recipient.email %]
-Subject: [[% terms.Bugzilla %]] [% subject %]
-MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="[% boundary %]"
-X-Bugzilla-Type: whine
-
-
-This is a MIME multipart message.  It is possible that your mail program
-doesn't quite handle these properly.  Some or all of the information in this
-message may be unreadable.
-
-
-[% FOREACH part=alternatives %]
-
---[% boundary %]
-Content-type: [% part.type +%]
-
-[%+ part.content %]
-[%+ END %]
---[% boundary %]--
-- 
cgit v1.2.3-24-g4f1b