diff options
author | Dexter Morgan <dmorgan@mageia.org> | 2013-02-20 16:07:49 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2014-09-15 20:44:40 +0100 |
commit | ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189 (patch) | |
tree | ece0d9c9d8fa1eff83f8527397da6b2c8c755dd6 /template/en/default/email/newchangedmail.txt.tmpl | |
parent | 48a4cb57974b7f1932c3fe31825c02e4dc4ab30c (diff) | |
download | bugzilla-ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189.tar bugzilla-ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189.tar.gz bugzilla-ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189.tar.bz2 bugzilla-ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189.tar.xz bugzilla-ba702dcd7ac9b2e6c4d46ad21c7bfacfd6883189.zip |
Add 4.0 branch
Diffstat (limited to 'template/en/default/email/newchangedmail.txt.tmpl')
-rw-r--r-- | template/en/default/email/newchangedmail.txt.tmpl | 66 |
1 files changed, 24 insertions, 42 deletions
diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl index 81abc02..c3a9d40 100644 --- a/template/en/default/email/newchangedmail.txt.tmpl +++ b/template/en/default/email/newchangedmail.txt.tmpl @@ -19,28 +19,31 @@ #%] [% PROCESS "global/variables.none.tmpl" %] -From: [% changername %] <bugzilla-daemon@mageia.org> +[% PROCESS "global/reason-descs.none.tmpl" %] + +From: [% Param('mailfrom') %] <bugzilla-daemon@mageia.org> To: [% to_user.email %] -Subject: [[% terms.Bug %] [%+ bugid %]] [% '[New] ' IF isnew %][%+ summary %] +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: [% classification %] +X-Bugzilla-Classification: [% bug.classification %] [% END %] -X-Bugzilla-Product: [% product %] -X-Bugzilla-Component: [% comp %] -X-Bugzilla-Keywords: [% keywords %] -X-Bugzilla-Severity: [% severity %] -X-Bugzilla-Who: [% changer %] -X-Bugzilla-Status: [% status %] -X-Bugzilla-Priority: [% priority %] -X-Bugzilla-Assigned-To: [% assignedto %] -X-Bugzilla-Target-Milestone: [% targetmilestone %] -X-Bugzilla-Changed-Fields: [% changedfields %] +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=[% bugid %] +[%+ urlbase %]show_bug.cgi?id=[% bug.id %] [%- IF diffs %] [%+ diffs %] @@ -56,33 +59,12 @@ X-Bugzilla-Changed-Fields: [% changedfields %] -- [%# 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 %] - [% SWITCH relationship %] - [% CASE constants.REL_ASSIGNEE %] -You are the assignee for the [% terms.bug %]. - [% CASE constants.REL_REPORTER %] -You reported the [% terms.bug %]. - [% CASE constants.REL_QA %] -You are the QA contact for the [% terms.bug %]. - [% CASE constants.REL_CC %] -You are on the CC list for the [% terms.bug %]. - [% CASE constants.REL_VOTER %] -You are a voter for the [% terms.bug %]. - [% CASE constants.REL_GLOBAL_WATCHER %] -You are watching all [% terms.bug %] changes. - [% END %] +[% SET reason_lines = [] %] +[% FOREACH reason = reasons %] + [% reason_lines.push(reason_descs.$reason) IF reason_descs.$reason %] [% END %] -[% FOREACH relationship = reasons_watch %] - [% SWITCH relationship %] - [% CASE constants.REL_ASSIGNEE %] -You are watching the assignee of the [% terms.bug %]. - [% CASE constants.REL_REPORTER %] -You are watching the reporter. - [% CASE constants.REL_QA %] -You are watching the QA contact of the [% terms.bug %]. - [% CASE constants.REL_CC %] -You are watching someone on the CC list of the [% terms.bug %]. - [% CASE constants.REL_VOTER %] -You are watching a voter for the [% terms.bug %]. - [% END %] +[% FOREACH reason = reasons_watch %] + [% reason_lines.push(watch_reason_descs.$reason) + IF watch_reason_descs.$reason %] [% END %] +[%+ reason_lines.join("\n") %] |