diff options
| -rw-r--r-- | template/en/default/email/bugmail-header.txt.tmpl | 36 | ||||
| -rw-r--r-- | template/en/default/email/newchangedmail.txt.tmpl | 70 |
2 files changed, 36 insertions, 70 deletions
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl new file mode 100644 index 0000000..cdda89a --- /dev/null +++ b/template/en/default/email/bugmail-header.txt.tmpl @@ -0,0 +1,36 @@ +[%# 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. + #%] + +[% PROCESS "global/reason-descs.none.tmpl" %] +[% isnew = bug.lastdiffed ? 0 : 1 %] +[% show_new = isnew + && (to_user.settings.bugmail_new_prefix.value == 'on') %] + +From: [% Param('mailfrom') %] +To: [% to_user.email %] +Subject: [[% terms.Bug %] [%+ bug.id %]] [% '[New]: ' IF show_new %][%+ bug.short_desc %] +Date: [% date %] +X-Bugzilla-Reason: [% reasonsheader %] +X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %] +X-Bugzilla-Watch-Reason: [% reasonswatchheader %] +[% IF Param('useclassification') %] +X-Bugzilla-Classification: [% bug.classification %] +[% END %] +X-Bugzilla-Product: [% bug.product %] +X-Bugzilla-Component: [% bug.component %] +X-Bugzilla-Version: [% bug.version %] +X-Bugzilla-Keywords: [% bug.keywords %] +X-Bugzilla-Severity: [% bug.bug_severity %] +X-Bugzilla-Who: [% changer.login %] +X-Bugzilla-Status: [% bug.bug_status %] +X-Bugzilla-Priority: [% bug.priority %] +X-Bugzilla-Assigned-To: [% bug.assigned_to.login %] +X-Bugzilla-Target-Milestone: [% bug.target_milestone %] +X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %] +X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %] +[%+ threadingmarker %] diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl deleted file mode 100644 index c3a9d40..0000000 --- a/template/en/default/email/newchangedmail.txt.tmpl +++ /dev/null @@ -1,70 +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): André Batosti <batosti@async.com.br> - #%] - -[% PROCESS "global/variables.none.tmpl" %] -[% PROCESS "global/reason-descs.none.tmpl" %] - -From: [% Param('mailfrom') %] <bugzilla-daemon@mageia.org> -To: [% to_user.email %] -Subject: [[% terms.Bug %] [%+ bugid %]] [% '[New]: ' IF isnew %][%+ bug.short_desc %] -Date: [% date %] -X-Bugzilla-Reason: [% reasonsheader %] -X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %] -X-Bugzilla-Watch-Reason: [% reasonswatchheader %] -[% IF Param('useclassification') %] -X-Bugzilla-Classification: [% bug.classification %] -[% END %] -X-Bugzilla-Product: [% bug.product %] -X-Bugzilla-Component: [% bug.component %] -X-Bugzilla-Keywords: [% bug.keywords %] -X-Bugzilla-Severity: [% bug.bug_severity %] -X-Bugzilla-Who: [% changer.login %] -X-Bugzilla-Status: [% bug.bug_status %] -X-Bugzilla-Priority: [% bug.priority %] -X-Bugzilla-Assigned-To: [% bug.assigned_to.login %] -X-Bugzilla-Target-Milestone: [% bug.target_milestone %] -X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %] -[%+ threadingmarker %] - -[%+ urlbase %]show_bug.cgi?id=[% bug.id %] -[%- IF diffs %] - -[%+ diffs %] -[% END -%] -[% FOREACH comment = new_comments %] - -[%- IF comment.count %] ---- Comment #[% comment.count %] from [% comment.author.identity %] [%+ comment.creation_ts FILTER time(undef, to_user.timezone) %] --- -[% END %] -[%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) %] -[% END %] - --- [%# Protect the trailing space of the signature marker %] -Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email -------- You are receiving this mail because: ------- -[% SET reason_lines = [] %] -[% FOREACH reason = reasons %] - [% reason_lines.push(reason_descs.$reason) IF reason_descs.$reason %] -[% END %] -[% FOREACH reason = reasons_watch %] - [% reason_lines.push(watch_reason_descs.$reason) - IF watch_reason_descs.$reason %] -[% END %] -[%+ reason_lines.join("\n") %] |