Merge remote-tracking branch 'upstream/pull/2837'

[rails.git] / app / views / notes / _notes_paging_nav.html.erb

diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index f9e51b5ae38f469e8e5b98b28abc808c3552ce3b..207f8877918bbaedf6af21f503f8b26c72efff8e 100644 (file)
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,17 +1,17 @@
 <p>
 
 <% if @page > 1 %>
-<%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
+<%= link_to t("changesets.changeset_paging_nav.previous"), @params.merge(:page => @page - 1) %>
 <% else %>
-<%= t('changeset.changeset_paging_nav.previous') %>
+<%= t("changesets.changeset_paging_nav.previous") %>
 <% end %>
 
-| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
+| <%= t("changesets.changeset_paging_nav.showing_page", :page => @page) %> |
 
-<% if @notes.size <= @page_size %>
-<%= t('changeset.changeset_paging_nav.next') %>
+<% if @notes.size < @page_size %>
+<%= t("changesets.changeset_paging_nav.next") %>
 <% else %>
-<%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
+<%= link_to t("changesets.changeset_paging_nav.next"), @params.merge(:page => @page + 1) %>
 <% end %>
 
 </p>