merge 19364:19600 of rails_port into the openID branch

[rails.git] / app / views / diary_entry / list.html.erb

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 00937d89e0001d9c765596ceb2cc0575dec7b5a2..68c8c12668bb7134fee58e6430fd4e208b9522ab 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -25,15 +25,15 @@
 
   <%= render :partial => 'diary_entry', :collection => @entries %>
        
-  <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+  <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
   <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
-  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+  <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
 
   <br />
 <% end %>
 
-<%= rss_link_to :action => 'rss' %>
+<%= rss_link_to :action => 'rss', :language => params[:language] %>
 
 <% content_for :head do %>
-<%= auto_discovery_link_tag :atom, :action => 'rss' %>
+<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
 <% end %>