Add some more missing translations. Use .to_sentence instead of .join(', ') so that...

[rails.git] / app / views / trace / _trace_paging_nav.rhtml

diff --git a/app/views/trace/_trace_paging_nav.rhtml b/app/views/trace/_trace_paging_nav.rhtml
index 4811336ab91fa57688cea023136ee438bc35f9dd..9ac80d4cd9a74678cd782e1648c0d9f548f588a6 100644 (file)
--- a/app/views/trace/_trace_paging_nav.rhtml
+++ b/app/views/trace/_trace_paging_nav.rhtml
@@ -1,19 +1,12 @@
-<%\r
-  range_start = ((@page - 1) * @traces_per_page) + 1\r
-  range_end = (@page==@max_page ? @max_trace : (@page * @traces_per_page))\r
-%>\r
-\r
-Showing page \r
-<%= @page %> (<%= range_start %><% \r
-if (@max_trace != range_start) # if more than 1 trace on page \r
-  %>-<%= range_end %><% \r
-end %>\r
-of <%= @max_trace %>)\r
-\r
-<% if @page > 1 %>\r
-  | <%= link_to 'previous page', {:controller => 'trace', :action => @paging_action, :page => @page-1}, {:title => 'previous page'} %>\r
-<% end %>\r
-\r
-<% if @page < @max_page %>\r
-  | <%= link_to 'next page', {:controller => 'trace', :action => @paging_action, :page => @page+1}, {:title => 'next page'} %>\r
-<% end %>\r
+<% current_page = @trace_pages.current_page %>
+
+<%= t'trace.trace_paging_nav.showing' %> 
+<%= current_page.number %> (<%= current_page.first_item %><% 
+if (current_page.first_item < current_page.last_item) # if more than 1 trace on page 
+  %>-<%= current_page.last_item %><% 
+end %>
+<%= t'trace.trace_paging_nav.of' %> <%= @trace_pages.item_count %>)
+
+<% if @trace_pages.page_count > 1 %>
+ | <%= pagination_links_each(@trace_pages, {}) { |n| link_to_page(n) } %>
+<% end %>