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

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

diff --git a/app/views/diary_entry/show.html.erb b/app/views/diary_entry/show.html.erb
index 9871da8ccfa09b5d9d8a8273e105302be5ccb521..02bebc5bc0d9f277106cbebb54551cf81daecd3c 100644 (file)
--- a/app/views/diary_entry/show.html.erb
+++ b/app/views/diary_entry/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
   <div id="userinformation" >
     <%= user_image @entry.user %>
 <% content_for :heading do %>
   <div id="userinformation" >
     <%= user_image @entry.user %>

-    <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
+    <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :index %></h2>

     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>
     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>


@@ -30,7 +30,7 @@
       <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
     <% end %>
   <% else %>
       <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
     <% end %>
   <% else %>

-    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3>
+    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'users', :action => 'login', :referer => request.fullpath)) %></h3>

   <% end %>
 </div>
 
   <% end %>
 </div>