jro_apps/redmine Commit - r182:0d55613359d9

replaced deprecated human_size by number_to_human_size...

Jean-Philippe Lang -

r182:0d55613359d9

parent child

Context file:

r182:0d55613359d9

Collapse all files

app/views/documents/show.rhtml +2 -2

                     <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
                     </div>
                     <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
-                    (<%= human_size attachment.filesize %>)<br />
+                    (<%= number_to_human_size attachment.filesize %>)<br />
                     <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
                     <%= lwr(:label_download, attachment.downloads) %>
                 </li>
               <% form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") do %>
                 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
                 <%= image_to_function "add.png", "addFileField();return false" %></label>
-                <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+                <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>

app/views/issues/_pdf.rfpdf +1 -1

             	for attachment in issue.attachments
             		pdf.SetFont('Arial','',8)
             	    pdf.Cell(80,5, attachment.filename)
-            		pdf.Cell(20,5, human_size(attachment.filesize),0,0,"R")
+            		pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
             		pdf.Cell(20,5, format_date(attachment.created_on),0,0,"R")
             		pdf.Cell(70,5, attachment.author.name,0,0,"R")
             		pdf.Ln

app/views/issues/show.rhtml +2 -2

             <table width="100%">
             <% for attachment in @issue.attachments %>
             <tr>
-            <td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= human_size(attachment.filesize) %>)</td>
+            <td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
             <td><%= format_date(attachment.created_on) %></td>
             <td><%= attachment.author.display_name %></td>
             <td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %></div></td>
               <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
               <p id="attachments_p"><label><%=l(:label_attachment_new)%>
               <%= image_to_function "add.png", "addFileField();return false" %></label>
-              <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+              <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>

app/views/projects/add_document.rhtml +1 -1

             <div class="box">
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <%= submit_tag l(:button_create) %>

app/views/projects/add_file.rhtml +1 -1

             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <%= submit_tag l(:button_add) %>
             <% end %>

app/views/projects/add_issue.rhtml +1 -1

             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             </div>
             <!--[eoform:issue]-->

app/views/projects/list_files.rhtml +1 -1

                 <td></td>
                 <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
                 <td align="center"><%= format_date(file.created_on) %></td>
-                <td align="center"><%= human_size(file.filesize) %></td>
+                <td align="center"><%= number_to_human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>
                 <td align="center"><small><%= file.digest %></small></td>
                 <% if delete_allowed %>

app/views/repositories/_dir_list.rhtml +2 -2

             @entries.each do |entry| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => ("icon " + (entry.is_dir? ? 'icon-folder' : 'icon-file')) %></td>
-            <td align="right"><%= human_size(entry.size) unless entry.is_dir? %></td>
+            <td align="right"><%= number_to_human_size(entry.size) unless entry.is_dir? %></td>
             <td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>
             <td align="center"><em><%=h entry.lastrev.author %></em></td>
             <td align="center"><%= format_time(entry.lastrev.time) %></td>
             end %>
             </tbody>
             </table>
-            <p class="textright"><em><%= l(:label_total) %>: <%= human_size(total_size) %></em></p>
  No newline at end of file
+            <p class="textright"><em><%= l(:label_total) %>: <%= number_to_human_size(total_size) %></em></p>
  No newline at end of file

app/views/repositories/revisions.rhtml +1 -1

             <% if @entry.is_file? %>
             <h3><%=h @entry.name %></h3>
-            <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= human_size @entry.size %>)</p>
+            <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= number_to_human_size @entry.size %>)</p>
             <% end %>
             <h3>Revisions</h3>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages