From eca4822f0ad4733af64425c10b9edd1d7ca62772 Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Wed, 21 Dec 2011 12:42:51 -0500 Subject: merged with bmo/4.0 --- .../en/default/requestwhiner/mail.html.tmpl | 26 ++++++++++++++-------- .../en/default/requestwhiner/mail.txt.tmpl | 25 ++++++++++++--------- 2 files changed, 31 insertions(+), 20 deletions(-) (limited to 'extensions/RequestWhiner/template/en') diff --git a/extensions/RequestWhiner/template/en/default/requestwhiner/mail.html.tmpl b/extensions/RequestWhiner/template/en/default/requestwhiner/mail.html.tmpl index de2c4dc6a..07b2b31ee 100644 --- a/extensions/RequestWhiner/template/en/default/requestwhiner/mail.html.tmpl +++ b/extensions/RequestWhiner/template/en/default/requestwhiner/mail.html.tmpl @@ -29,17 +29,27 @@ -

Here are your outstanding requests older than [% threshold FILTER html%] -days:

+

The following is a list of requests people have made of you, which have been +outstanding more than [% threshold FILTER html %] days. To avoid disappointing +others, please deal with them as quickly as possible. +(Here is some +guidance on handling requests.) +

-[% FOREACH request = requests.keys %] -

[% request FILTER html %]

+[% FOREACH request_type = requests.keys %] +

[% request_type FILTER html %]

@@ -48,7 +58,5 @@ days:

See all your outstanding requests.

-

A href="https://wiki.mozilla.org/BMO/Handling_Requests">Get guidance on handling requests.

- diff --git a/extensions/RequestWhiner/template/en/default/requestwhiner/mail.txt.tmpl b/extensions/RequestWhiner/template/en/default/requestwhiner/mail.txt.tmpl index a7cfd9668..c8091c057 100644 --- a/extensions/RequestWhiner/template/en/default/requestwhiner/mail.txt.tmpl +++ b/extensions/RequestWhiner/template/en/default/requestwhiner/mail.txt.tmpl @@ -20,19 +20,22 @@ [% PROCESS global/variables.none.tmpl %] [% PROCESS 'global/field-descs.none.tmpl' %] -Here are your outstanding requests older than [% threshold %] days: +The following is a list of requests people have made of you, which have been +outstanding more than [% threshold %] days. To avoid disappointing others, please deal with +them as quickly as possible. Here is some guidance on handling requests: + https://wiki.mozilla.org/BMO/Handling_Requests -[% FOREACH request = requests.keys %] -[%+ request +%] -[%+ "-" FILTER repeat(request.length) +%] +[% FOREACH request_type = requests.keys %] +[%+ request_type +%] +[%+ "-" FILTER repeat(request_type.length) +%] - [% FOREACH bug = requests.$request %] - [%+ terms.Bug +%] [%+ bug.id %]: [% bug.summary +%] ([% bug.age %] days old) - [%+ urlbase %]show_bug.cgi?id=[% bug.id +%] + [% FOREACH request = requests.$request_type %] + [%+ terms.Bug +%] [%+ request.bug_id %]: [% request.summary +%] ([% request.age %] days old) + [%+ urlbase %]show_bug.cgi?id=[% request.bug_id +%] + [% IF request.attach_id %] + [%+ urlbase %]attachment.cgi?id=[% request.attach_id %]&action=edit + [% END %] [%+ END +%] [% END %] To see all your outstanding requests, visit: -[%+ urlbase %]request.cgi?action=queue&requestee=[% recipient.email FILTER uri %]&group=type - -For guidance on handling requests, see: -https://wiki.mozilla.org/BMO/Handling_Requests +[%+ urlbase %]request.cgi?action=queue&requestee=[% recipient.email FILTER url_quote %]&group=type -- cgit v1.2.3-24-g4f1b