From f98af557d48ae9cea1d41fff18643200af7f7d8e Mon Sep 17 00:00:00 2001 From: Marc Schumann Date: Fri, 25 Mar 2011 18:40:20 +0100 Subject: Bug 644969: Rename bugmail-common.txt.html to bugmail-common.txt.tmpl. r/a=LpSolit --- template/en/default/email/bugmail-common.txt.html | 38 ----------------------- template/en/default/email/bugmail-common.txt.tmpl | 38 +++++++++++++++++++++++ template/en/default/email/bugmail.html.tmpl | 4 +-- template/en/default/email/bugmail.txt.tmpl | 2 +- 4 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 template/en/default/email/bugmail-common.txt.html create mode 100644 template/en/default/email/bugmail-common.txt.tmpl (limited to 'template/en/default/email') diff --git a/template/en/default/email/bugmail-common.txt.html b/template/en/default/email/bugmail-common.txt.html deleted file mode 100644 index b6cadaf11..000000000 --- a/template/en/default/email/bugmail-common.txt.html +++ /dev/null @@ -1,38 +0,0 @@ -[%# 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 Guy Pyrzak - # Portions created by the Initial Developer are Copyright (C) 2010 the - # Initial Developer. All Rights Reserved. - # - # Contributor(s): Guy Pyrzak - #%] - -[% PROCESS "global/field-descs.none.tmpl" %] - -[% field_label = field_descs.${change.field_name} %] -[% old_value = display_value(change.field_name, change.old) %] -[% new_value = display_value(change.field_name, change.new) %] - -[% IF change.field_name == "estimated_time" || change.field_name == "remaining_time" %] - [% old_value = old_value FILTER format('%.2f') %] - [% new_value = new_value FILTER format('%.2f') %] -[% END %] - -[% IF change.attach_id %] - [% field_label = field_label.replace('^(Attachment )?', "Attachment #${change.attach_id} ") %] -[% END %] - -[% IF change.field_name == 'longdescs.isprivate' %] - [% field_label = field_label.replace('^(Comment )?', "Comment #${change.num} ") %] -[% END %] - \ No newline at end of file diff --git a/template/en/default/email/bugmail-common.txt.tmpl b/template/en/default/email/bugmail-common.txt.tmpl new file mode 100644 index 000000000..b6cadaf11 --- /dev/null +++ b/template/en/default/email/bugmail-common.txt.tmpl @@ -0,0 +1,38 @@ +[%# 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 Guy Pyrzak + # Portions created by the Initial Developer are Copyright (C) 2010 the + # Initial Developer. All Rights Reserved. + # + # Contributor(s): Guy Pyrzak + #%] + +[% PROCESS "global/field-descs.none.tmpl" %] + +[% field_label = field_descs.${change.field_name} %] +[% old_value = display_value(change.field_name, change.old) %] +[% new_value = display_value(change.field_name, change.new) %] + +[% IF change.field_name == "estimated_time" || change.field_name == "remaining_time" %] + [% old_value = old_value FILTER format('%.2f') %] + [% new_value = new_value FILTER format('%.2f') %] +[% END %] + +[% IF change.attach_id %] + [% field_label = field_label.replace('^(Attachment )?', "Attachment #${change.attach_id} ") %] +[% END %] + +[% IF change.field_name == 'longdescs.isprivate' %] + [% field_label = field_label.replace('^(Comment )?', "Comment #${change.num} ") %] +[% END %] + \ No newline at end of file diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index 9c5283306..5e81efa6a 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -90,7 +90,7 @@ [% END %] - [% PROCESS "email/bugmail-common.txt.html" %] + [% PROCESS "email/bugmail-common.txt.tmpl" %] [% IF isnew %] @@ -118,4 +118,4 @@ [% END %] [% END %] -[% END %] \ No newline at end of file +[% END %] diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl index 1b3bdf201..2d20aff7c 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -70,7 +70,7 @@ You are receiving this mail because: What |Removed |Added ---------------------------------------------------------------------------- [%+ END %][%# End of IF. This indentation is intentional! ~%] - [% PROCESS "email/bugmail-common.txt.html"%] + [% PROCESS "email/bugmail-common.txt.tmpl"%] [%~ IF isnew %] [% format_columns(2, field_label _ ":", new_value) -%] [% ELSE %] -- cgit v1.2.3-24-g4f1b