diff options
Diffstat (limited to 'template/en/default/email')
| -rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 23 | ||||
| -rw-r--r-- | template/en/default/email/flagmail.html.tmpl | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index c3b8b357f..1a74db4dc 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -22,9 +22,10 @@ <div> [% IF comment.count %] [% comment_anchor = "#c$comment.count" %] - <b>[% "Comment # ${comment.count}" FILTER bug_link(bug, - {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %] - on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %] + <b>[% INCLUDE bug/link.html.tmpl bug = bug, link_text = "Comment # ${comment.count}", + comment_num = comment.count, full_url = 1, user = to_user %] + on [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", + full_url = 1, user = to_user %] from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b> [% END %] [% comment_div = comment.is_markdown ? "div" : "pre" %] @@ -86,14 +87,14 @@ [% SET in_table = 0 %] [% END %] [% IF change.blocker %] - [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] - depends on - [%+ "${terms.bug} ${change.blocker.id}" - FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %], - which changed state. + [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %] + depends on + [%+ INCLUDE bug/link.html.tmpl bug = change.blocker, link_text = "$terms.bug $change.blocker.id", + full_url = 1, user = to_user %], + which changed state. [% ELSE %] - [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed - [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] + [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed + [%+ INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", full_url = 1, user = to_user %] [% END %] <br> [% IF in_table == 0 %] @@ -117,7 +118,7 @@ <th>[% field_label FILTER html %]</th> <td> [% IF change.field_name == "bug_id" %] - [% new_value FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %] + [% INCLUDE bug/link.html.tmpl bug = bug, link_text = new_value, full_url = 1, user = to_user %] [% ELSE %] [% new_value FILTER html %] [% END %] diff --git a/template/en/default/email/flagmail.html.tmpl b/template/en/default/email/flagmail.html.tmpl index d0b61fbbc..1c8fc0731 100644 --- a/template/en/default/email/flagmail.html.tmpl +++ b/template/en/default/email/flagmail.html.tmpl @@ -47,7 +47,7 @@ </p> <p> - [% "$terms.Bug $bug.bug_id" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]: + [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]: [%= bug.short_desc FILTER html %] </p> |