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

[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 108cbb3d233747d75f94140c2529fc1737c63a72..694f9960258634b1858915d5f207dcc259e2e807 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 %>
 <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 %>
 <% else %>

-<%= t('changeset.changeset_paging_nav.previous') %>
+<%= t('changesets.changeset_paging_nav.previous') %>

 <% end %>
 
 <% end %>
 

-| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
+| <%= t('changesets.changeset_paging_nav.showing_page', :page => @page) %> |

 
 <% if @notes.size < @page_size %>
 
 <% if @notes.size < @page_size %>

-<%= t('changeset.changeset_paging_nav.next') %>
+<%= t('changesets.changeset_paging_nav.next') %>

 <% else %>
 <% 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>
 <% end %>
 
 </p>