summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/attachment/created.html.tmpl22
-rw-r--r--template/en/default/attachment/delete_reason.txt.tmpl4
-rw-r--r--template/en/default/attachment/updated.html.tmpl9
-rw-r--r--template/en/default/filterexceptions.pl9
4 files changed, 19 insertions, 25 deletions
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index e6037bcba..515463989 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -20,10 +20,7 @@
#%]
[%# INTERFACE:
- # bugid: integer. ID of the bug we just attached an attachment to.
- # attachid: integer. ID of the attachment just created.
- # description: string. Description of the attachment just created.
- # contenttype: string. The Content Type we attached it as.
+ # attachment: object of the attachment just created.
# contenttypemethod: string. How we got the content type of the attachment.
# Possible values: autodetect, list, manual.
#%]
@@ -36,11 +33,12 @@
<dl>
<dt>
- <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
- to [% "$terms.bug $bugid" FILTER bug_link(bugid) %] created
+ <a title="[% attachment.description FILTER html %]"
+ href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">Attachment #[% attachment.id %]</a>
+ to [% "$terms.bug $attachment.bug_id" FILTER bug_link(attachment.bug_id) FILTER none %] created
</dt>
<dd>
- [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = attachment.bug_id %]
[% IF convertedbmp %]
<p>
<b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
@@ -50,9 +48,9 @@
[% IF contenttypemethod == 'autodetect' %]
<p>
<b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
- <em>[% contenttype %]</em> for this attachment. If this is
- incorrect, correct the value by
- editing the attachment's <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">details</a>.
+ <em>[% attachment.contenttype FILTER html %]</em> for this attachment. If this is
+ incorrect, correct the value by editing the attachment's
+ <a href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">details</a>.
</p>
[% END %]
@@ -62,8 +60,8 @@
</dl>
<p>
-<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create
- Another Attachment to [% terms.Bug %] #[% bugid %]</a>
+<a href="attachment.cgi?bugid=[% attachment.bug_id %]&amp;action=enter">Create
+ Another Attachment to [% terms.Bug %] #[% attachment.bug_id %]</a>
</p>
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/delete_reason.txt.tmpl b/template/en/default/attachment/delete_reason.txt.tmpl
index 45879f6ca..0d66fcfc5 100644
--- a/template/en/default/attachment/delete_reason.txt.tmpl
+++ b/template/en/default/attachment/delete_reason.txt.tmpl
@@ -15,12 +15,12 @@
#%]
[%# INTERFACE:
- # attachid: ID of the attachment the user wants to delete.
+ # attachment: object of the attachment the user wants to delete.
# reason: string; The reason provided by the user.
# date: the date when the request to delete the attachment was made.
#%]
-The content of attachment [% attachid %] has been deleted by
+The content of attachment [% attachment.id %] has been deleted by
[%+ user.identity %]
[% IF reason %]
who provided the following reason:
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index a66b74e17..fac376fdc 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -21,8 +21,7 @@
#%]
[%# INTERFACE:
- # bugid: integer. ID of the bug we are updating.
- # attachid: integer. ID of the attachment we just attached.
+ # attachment: object of the attachment we just attached.
#%]
[% PROCESS global/variables.none.tmpl %]
@@ -33,11 +32,11 @@
<dl>
<dt>Changes to
- <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
- of [% "$terms.bug $bugid" FILTER bug_link(bugid) %] submitted
+ <a href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">attachment [% attachment.id %]</a>
+ of [% "$terms.bug $attachment.bug_id" FILTER bug_link(attachment.bug_id) FILTER none %] submitted
</dt>
<dd>
- [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = attachment.bug_id %]
[%# Links to more information about the changed bug. %]
[% Hook.process("links") %]
</dd>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 0df0a0363..231ad98f5 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -414,10 +414,8 @@
],
'attachment/created.html.tmpl' => [
- 'attachid',
- 'bugid',
- 'contenttype',
- '"$terms.bug $bugid" FILTER bug_link(bugid)',
+ 'attachment.id',
+ 'attachment.bug_id',
],
'attachment/edit.html.tmpl' => [
@@ -439,8 +437,7 @@
],
'attachment/updated.html.tmpl' => [
- 'attachid',
- '"$terms.bug $bugid" FILTER bug_link(bugid)',
+ 'attachment.id',
],
'attachment/diff-header.html.tmpl' => [