From b9cf9c6aaceca5904a133ab2813d01763d8e7896 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 19 Oct 2011 14:57:16 +0200 Subject: Bug 652149: Rename request/email.txt.tmpl into email/flagmail.txt.tmpl r=glob a=LpSolit --- template/en/default/email/flagmail.txt.tmpl | 90 +++++++++++++++++++++++++++++ template/en/default/request/email.txt.tmpl | 90 ----------------------------- 2 files changed, 90 insertions(+), 90 deletions(-) create mode 100644 template/en/default/email/flagmail.txt.tmpl delete mode 100644 template/en/default/request/email.txt.tmpl (limited to 'template') diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl new file mode 100644 index 000000000..fb957484b --- /dev/null +++ b/template/en/default/email/flagmail.txt.tmpl @@ -0,0 +1,90 @@ +[%# 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 Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Myk Melez + # Jeff Hedlund + # Frédéric Buclin + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %] +[% attidsummary = attachment.id _ ': ' _ attachment.description %] +[% flagtype_name = flag ? flag.type.name : old_flag.type.name %] +[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" , + '?' => "asked" } %] + +[% to_identity = "" %] +[% on_behalf_of = 0 %] +[% action = flag.status || 'X' %] + +[% IF flag && flag.status == '?' %] + [% subject_status = "requested" %] + [% IF flag.setter_id == user.id %] + [% to_identity = flag.requestee.identity _ " for" %] + [% ELSE %] + [% on_behalf_of = 1 %] + [% IF flag.requestee %][% to_identity = " to " _ flag.requestee.identity %][% END %] + [% END %] +[% ELSE %] + [% IF old_flag && old_flag.status == '?' %] + [% to_identity = old_flag.setter.identity _ "'s request for" %] + [% END %] + [% subject_status = statuses.$action %] +[% END %] +From: [% Param('mailfrom') %] +To: [% to %] +Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %] +[%- IF attachment %] : + [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %] +Date: [% date %] +X-Bugzilla-Type: request +[%+ threadingmarker %] + +[%+ USE wrap -%] +[%- FILTER bullet = wrap(80) -%] + +[% IF on_behalf_of %] +[% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% flagtype_name %] +[% to_identity %]: +[% ELSE %] +[% user.identity %] has [% statuses.$action %] [%+ to_identity %] [%+ flagtype_name %]: +[% END %] + +[% terms.Bug %] [%+ bugidsummary %] +[% END %] +[%+ urlbase %]show_bug.cgi?id=[% bug.bug_id %] +[% IF attachment %] + +[% FILTER bullet = wrap(80) %] +Attachment [% attidsummary %] +[%- END %] +[%+ urlbase %]attachment.cgi?id=[% attachment.id %]&action=edit +[%- END %] + +[%- Hook.process('after_summary') -%] + +[%- FILTER bullet = wrap(80) %] + +[% USE Bugzilla %] +[%-# .defined is necessary to avoid a taint issue in Perl < 5.10.1, see bug 509794. %] +[% IF Bugzilla.cgi.param("comment").defined && Bugzilla.cgi.param("comment").length > 0 %] +------- Additional Comments from [% user.identity %] +[%+ Bugzilla.cgi.param("comment") %] +[% END %] + +[%- END %] diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl deleted file mode 100644 index fb957484b..000000000 --- a/template/en/default/request/email.txt.tmpl +++ /dev/null @@ -1,90 +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 Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Myk Melez - # Jeff Hedlund - # Frédéric Buclin - #%] - -[% PROCESS global/variables.none.tmpl %] - -[% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %] -[% attidsummary = attachment.id _ ': ' _ attachment.description %] -[% flagtype_name = flag ? flag.type.name : old_flag.type.name %] -[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" , - '?' => "asked" } %] - -[% to_identity = "" %] -[% on_behalf_of = 0 %] -[% action = flag.status || 'X' %] - -[% IF flag && flag.status == '?' %] - [% subject_status = "requested" %] - [% IF flag.setter_id == user.id %] - [% to_identity = flag.requestee.identity _ " for" %] - [% ELSE %] - [% on_behalf_of = 1 %] - [% IF flag.requestee %][% to_identity = " to " _ flag.requestee.identity %][% END %] - [% END %] -[% ELSE %] - [% IF old_flag && old_flag.status == '?' %] - [% to_identity = old_flag.setter.identity _ "'s request for" %] - [% END %] - [% subject_status = statuses.$action %] -[% END %] -From: [% Param('mailfrom') %] -To: [% to %] -Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %] -[%- IF attachment %] : - [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %] -Date: [% date %] -X-Bugzilla-Type: request -[%+ threadingmarker %] - -[%+ USE wrap -%] -[%- FILTER bullet = wrap(80) -%] - -[% IF on_behalf_of %] -[% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% flagtype_name %] -[% to_identity %]: -[% ELSE %] -[% user.identity %] has [% statuses.$action %] [%+ to_identity %] [%+ flagtype_name %]: -[% END %] - -[% terms.Bug %] [%+ bugidsummary %] -[% END %] -[%+ urlbase %]show_bug.cgi?id=[% bug.bug_id %] -[% IF attachment %] - -[% FILTER bullet = wrap(80) %] -Attachment [% attidsummary %] -[%- END %] -[%+ urlbase %]attachment.cgi?id=[% attachment.id %]&action=edit -[%- END %] - -[%- Hook.process('after_summary') -%] - -[%- FILTER bullet = wrap(80) %] - -[% USE Bugzilla %] -[%-# .defined is necessary to avoid a taint issue in Perl < 5.10.1, see bug 509794. %] -[% IF Bugzilla.cgi.param("comment").defined && Bugzilla.cgi.param("comment").length > 0 %] -------- Additional Comments from [% user.identity %] -[%+ Bugzilla.cgi.param("comment") %] -[% END %] - -[%- END %] -- cgit v1.2.3-24-g4f1b