# HG changeset patch
# User Chris Cannam
# Date 1350401330 -3600
# Node ID f8985bd5d0d6fdbd47584437fc6029c9d20dab9a
# Parent  352539ac7b434b1f001835150bf26208f1ab6b4d# Parent  5251072c02b6eb441f76a5d98b4b6f705bb92b9f
Merge from branch "feature_523"

diff -r 352539ac7b43 -r f8985bd5d0d6 app/views/attachments/_links.html.erb
--- a/app/views/attachments/_links.html.erb	Tue Oct 16 15:36:12 2012 +0100
+++ b/app/views/attachments/_links.html.erb	Tue Oct 16 16:28:50 2012 +0100
@@ -2,7 +2,7 @@
 <% for attachment in attachments %>
 <p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
 <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
-  <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
+  <span class="size">(<%= number_to_human_size attachment.filesize %><%= ", " + l(:label_x_downloads, :count => attachment.downloads) unless attachment.downloads == 0 %>)</span>
   <% if options[:deletable] %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                          :confirm => l(:text_are_you_sure),
diff -r 352539ac7b43 -r f8985bd5d0d6 config/locales/en.yml
--- a/config/locales/en.yml	Tue Oct 16 15:36:12 2012 +0100
+++ b/config/locales/en.yml	Tue Oct 16 16:28:50 2012 +0100
@@ -487,6 +487,10 @@
     zero:  no projects
     one:   1 project
     other: "%{count} projects"
+  label_x_downloads:
+    zero:  never downloaded
+    one:   downloaded once
+    other: "downloaded %{count} times"
   label_project_all: All Projects
   label_project_latest: Latest projects
   label_projects_more: More projects