diff options
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/request/created-email.txt.tmpl | 41 | ||||
| -rw-r--r-- | template/en/default/request/email.txt.tmpl | 65 | ||||
| -rw-r--r-- | template/en/default/request/fulfilled-email.txt.tmpl | 42 |
3 files changed, 65 insertions, 83 deletions
diff --git a/template/en/default/request/created-email.txt.tmpl b/template/en/default/request/created-email.txt.tmpl deleted file mode 100644 index 1986d1295..000000000 --- a/template/en/default/request/created-email.txt.tmpl +++ /dev/null @@ -1,41 +0,0 @@ -[%# 1.0@bugzilla.org %] -[%# 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 <myk@mozilla.org> - #%] -From: bugzilla-request-daemon -To: [% flag.requestee.email IF flag.requestee.email_prefs.FlagRequestee %] -CC: [% flag.type.cc_list %] -Subject: [% flag.type.name %]: [Bug [% flag.target.bug.id %]] [% flag.target.bug.summary %] -[%- IF flag.target.attachment.exists %] : - [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %] - -[%+ USE wrap -%] -[%- FILTER bullet = wrap(80) -%] -[% user.realname %] <[% user.login %]> has asked you for [% flag.type.name %] on bug # - [%- flag.target.bug.id %] ([% flag.target.bug.summary %]) -[%- IF flag.target.attachment.exists %], attachment # - [%- flag.target.attachment.id %] ([% flag.target.attachment.summary %])[% END %]. - -[%+ IF flag.target.type == 'bug' -%] - [% Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %] -[%- ELSIF flag.target.type == 'attachment' -%] - [% Param('urlbase') %]attachment.cgi?id=[% flag.target.attachment.id %]&action=edit -[%- END %] - -[%- END %] diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl new file mode 100644 index 000000000..e35132181 --- /dev/null +++ b/template/en/default/request/email.txt.tmpl @@ -0,0 +1,65 @@ +[%# 1.0@bugzilla.org %] +[%# 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 <myk@mozilla.org> + # Jeff Hedlund <jeff.hedlund@matrixsi.com> + #%] +[% bugidsummary = flag.target.bug.id _ ': ' _ flag.target.bug.summary %] +[% attidsummary = flag.target.attachment.id _ ': ' _ + flag.target.attachment.summary %] +[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" , + '?' => "asked" } %] +[% IF flag.status == '?' %] + [% to_email = flag.requestee.email IF flag.requestee.email_prefs.FlagRequestee %] + [% to_identity = flag.requestee.identity %] + [% subject_status = "requested" %] +[% ELSE %] + [% to_email = flag.setter.email IF flag.setter.email_prefs.FlagRequester %] + [% to_identity = flag.setter.identity _ "'s request" %] + [% subject_status = statuses.${flag.status} %] +[% END %] +From: bugzilla-request-daemon +To: [% to_email %] +CC: [% flag.type.cc_list %] +Subject: [% flag.type.name %] [%+ subject_status %]: [Bug [% flag.target.bug.id %]] [% flag.target.bug.summary %] +[%- IF flag.target.attachment.exists %] : + [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %] + +[%+ USE wrap -%] +[%- FILTER bullet = wrap(80) -%] + +[% user.realname %] <[% user.login %]> has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]: + +Bug [% bugidsummary %] +[% END %] +[%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %] +[% IF flag.target.attachment.exists %] + +[% FILTER bullet = wrap(80) %] +Attachment [% attidsummary %] +[%- END %] +[%+ Param('urlbase') %]attachment.cgi?id=[% flag.target.attachment.id %]&action=edit +[%- END %] +[%- FILTER bullet = wrap(80) %] + +[% IF form.comment.length > 0 %] +------- Additional Comments from [% user.realname %] <[% user.login %]> +[%+ form.comment %] +[% END %] + +[%- END %] diff --git a/template/en/default/request/fulfilled-email.txt.tmpl b/template/en/default/request/fulfilled-email.txt.tmpl deleted file mode 100644 index 84608c546..000000000 --- a/template/en/default/request/fulfilled-email.txt.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -[%# 1.0@bugzilla.org %] -[%# 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 <myk@mozilla.org> - #%] -[% statuses = { '+' => "approved" , '-' => 'denied' , 'X' => "cancelled" } %] -From: bugzilla-request-daemon -To: [% flag.setter.email IF flag.setter.email_prefs.FlagRequester %] -CC: [% flag.type.cc_list %] -Subject: [% flag.type.name %]: [Bug [% flag.target.bug.id %]] [% flag.target.bug.summary %] -[%- IF flag.target.attachment.exists %] : - [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %] - -[%+ USE wrap -%] -[%- FILTER bullet = wrap(80) -%] -[% user.realname %] <[% user.login %]> has [% statuses.${flag.status} %] your request for [% flag.type.name %] on bug # - [%- flag.target.bug.id %] ([% flag.target.bug.summary %]) -[%- IF flag.target.attachment.exists %], attachment # - [%- flag.target.attachment.id %] ([% flag.target.attachment.summary %])[% END %]. - -[%+ IF flag.target.type == 'bug' -%] - [% Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %] -[%- ELSIF flag.target.type == 'attachment' -%] - [% Param('urlbase') %]attachment.cgi?id=[% flag.target.attachment.id %]&action=edit -[%- END %] - -[%- END %] |