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

[rails.git] / app / views / layouts / _header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a3e1846a98b75cfa37a87d14c0740dbc74149cb8..e17c6a77be4cdfff11fc6444cdae7292b53515a4 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -82,14 +82,14 @@
           <li>
             <%= link_to inbox_messages_path do %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
           <li>
             <%= link_to inbox_messages_path do %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>

-              <%= t('user.show.my messages') %>
+              <%= t('users.show.my messages') %>

             <% end %>
           </li>
           <li>
             <% end %>
           </li>
           <li>

-            <%= link_to t('user.show.my profile'), user_path(:display_name => current_user.display_name) %>
+            <%= link_to t('users.show.my profile'), user_path(current_user) %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('user.show.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
+            <%= link_to t('users.show.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>

           </li>
           <li class="divider"></li>
           <li>
           </li>
           <li class="divider"></li>
           <li>