Bug 457657 – Make e-mail comment header localizable.

Patch by Marc Schumann <wurblzap@gmail.com>,
r/a=LpSolit

3 files changed, 67 insertions, 17 deletions

diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl
new file mode 100755
index 000000000..6da39e6eb
--- /dev/null
+++ b/template/en/default/bug/format_comment.txt.tmpl
@@ -0,0 +1,61 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Marc Schumann.
+  # Portions created by Marc Schumann are Copyright (c) 2008 Marc Schumann.
+  # All rights reserved.
+  #
+  # Contributor(s): Marc Schumann <wurblzap@gmail.com>
+  #%]
+
+[%# INTERFACE:
+  #   comment: A hash containing comment information.
+  #              count:           The comment number (on the bug it belongs to)
+  #              author:          The Bugzilla::User object of the comment's
+  #                               author
+  #              time:            The time at which the comment has been
+  #                               committed
+  #              body:            The comment text
+  #              type:            One of the CMT_* constants (not given if none
+  #                               applies)
+  #              extra_data:      Extra data (type specific)
+  #              already_wrapped: Determines whether the comment is pre-wrapped
+  #%]
+
+[% PROCESS 'global/field-descs.none.tmpl' %]
+
+[% IF comment.already_wrapped %]
+  [% wrapped_comment = comment.body %]
+[% ELSE %]
+  [% wrapped_comment = comment.body FILTER wrap_comment %]
+[% END %]
+
+[%- IF comment.type == constants.CMT_DUPE_OF -%]
+[% wrapped_comment %]
+
+*** This [% terms.bug %] has been marked as a duplicate of [% terms.bug %] [%+ comment.extra_data %] ***
+[% ELSIF comment.type == constants.CMT_HAS_DUPE %]
+*** [% terms.Bug %] [%+ comment.extra_data %] has been marked as a duplicate of this [% terms.bug %]. ***
+[% ELSIF comment.type == constants.CMT_POPULAR_VOTES %]
+*** This [% terms.bug %] has been confirmed by popular vote. ***
+[% ELSIF comment.type == constants.CMT_MOVED_TO %]
+[% wrapped_comment %]
+
+[%+ terms.Bug %] moved to [% Param("move-to-url") %].
+If the move succeeded, [% comment.extra_data %] will receive a mail containing
+the number of the new [% terms.bug %] in the other database.
+If all went well, please mark this [% terms.bug %]
+[%+ get_status('VERIFIED') %], and paste in a link to the new [% terms.bug %].
+Otherwise, reopen this [% terms.bug %].
+[%- ELSE -%]
+[%- wrapped_comment %]
+[% END %]
diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index 613e174f0..494c12060 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -43,8 +43,13 @@ X-Bugzilla-Changed-Fields: [% changedfields %]
 [%+ urlbase %]show_bug.cgi?id=[% bugid %]
 
 [%+ diffs %]
+[% FOREACH comment = new_comments %]
 
--- 
+--- Comment #[% comment.count %] from [% comment.author.identity %] [%+ comment.time FILTER time %] ---
+[%+ PROCESS bug/format_comment.txt.tmpl comment = comment %]
+[% END %]
+
+-- [%# Protect the trailing space of the signature marker %]
 Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email
 ------- You are receiving this mail because: -------
 [% FOREACH relationship = reasons %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 1bc10daa9..c29f3f14f 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -124,25 +124,9 @@
     Please add your attachment by clicking the "Add an Attachment" link
     below.
 
-  [% ELSIF message_tag == "bug_confirmed_by_votes" %]
-    *** This [% terms.bug %] has been confirmed by popular vote. ***
-
-  [% ELSIF message_tag == "bug_duplicate_of" %]
-    *** This [% terms.bug %] has been marked as a duplicate of [% terms.bug %] [%+ dupe_of FILTER html %] ***
-
-  [% ELSIF message_tag == "bug_has_duplicate" %]
-    *** [% terms.Bug %] [%+ dupe FILTER html %] has been marked as a duplicate of this [% terms.bug %]. ***
-
   [% ELSIF message_tag == "bug_group_description" %]
     Access to [% terms.bugs %] in the [% product.name FILTER html %] product
 
-  [% ELSIF message_tag == "bug_moved_to" %]
-    <p>[% terms.Bug %] moved to [% Param("move-to-url") FILTER html %].</p>
-    <p>If the move succeeded, [% login FILTER html %] will receive a mail
-    containing the number of the new [% terms.bug %] in the other database.
-    If all went well, please mark this [% terms.bug %] verified, and paste
-    in a link to the new [% terms.bug %]. Otherwise, reopen this [% terms.bug %].
-
   [% ELSIF message_tag == "buglist_adding_field" %]
     [% title = "Adding field to search page..." %]
     [% link  = "Click here if the page does not redisplay automatically." %]