Bug 803600: Clean up the comment generated when deleting attachments

r=justdave a=LpSolit

diff --git a/attachment.cgi b/attachment.cgi
index 775a91f00008a843aeaea374492d2bcd716ad8d1..120cc2b45410b0b9c5c0e5e0da17bd9060ce2af2 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -751,7 +751,6 @@ sub delete_attachment {
         # The token is valid. Delete the content of the attachment.
         my $msg;
         $vars->{'attachment'} = $attachment;
-        $vars->{'date'} = $date;
         $vars->{'reason'} = clean_text($cgi->param('reason') || '');
 
         $template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg)

diff --git a/template/en/default/attachment/delete_reason.txt.tmpl b/template/en/default/attachment/delete_reason.txt.tmpl
index 7d45efec0c1a9dd7b4fbb5961cbd98a479a49686..16315550d0301bac5498630120de25dfc1c4b501 100644 (file)
--- a/template/en/default/attachment/delete_reason.txt.tmpl
+++ b/template/en/default/attachment/delete_reason.txt.tmpl
@@ -9,17 +9,10 @@
 [%# INTERFACE:
   # 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 [% attachment.id %] has been deleted by
-    [%+ user.identity %]
-[% IF reason %]
-who provided the following reason:
+The content of attachment [% attachment.id %] has been deleted
+[%~ IF reason %] for the following reason:
 
 [%+ reason %]
-[% ELSE %]
-without providing any reason.
 [% END %]
-
-The token used to delete this attachment was generated at [% date FILTER time %].