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

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

diff --git a/app/views/user/show.html.erb b/app/views/user/show.html.erb
index 0b48d28d2ee98faeef39030041c67c27e0d9f4d1..30c72b14021c189d5adac3e32d423547b1d4db81 100644 (file)
--- a/app/views/user/show.html.erb
+++ b/app/views/user/show.html.erb
@@ -18,7 +18,7 @@
             <span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
           </li>
           <li>

-            <%= link_to t('.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => current_user.display_name %>
+            <%= link_to t('.my diary'), :controller => 'diary_entry', :action => 'index', :display_name => current_user.display_name %>

             <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
           </li>
           <li>


@@ -66,7 +66,7 @@
             <%= link_to t('.send message'), new_message_path(@user) %>
           </li>
           <li>
             <%= link_to t('.send message'), new_message_path(@user) %>
           </li>
           <li>

-            <%= link_to t('.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+            <%= link_to t('.diary'), :controller => 'diary_entry', :action => 'index', :display_name => @user.display_name %>

             <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
           </li>
           <li>