Rename user_controller to users_controller

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

diff --git a/app/views/user/show.html.erb b/app/views/users/show.html.erb
similarity index 97%
rename from app/views/user/show.html.erb
rename to app/views/users/show.html.erb
index 30c72b14021c189d5adac3e32d423547b1d4db81..7aa3abd2782b958ee8761ca7edf25f7d1d44e052 100644 (file)
--- a/app/views/user/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -25,7 +25,7 @@
             <%= link_to t('.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => current_user.display_name %>
           </li>
           <li>
-            <%= link_to t('.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
+            <%= link_to t('.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
           </li>
 
           <% if current_user.blocks.exists? %>
@@ -179,7 +179,7 @@
   <% if current_user and @user.id == current_user.id %>
     <% if @user.home_lat.nil? or @user.home_lon.nil? %>
       <div id="map" class="content_map">
-        <p id="no_home_location"><%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %></p>
+        <p id="no_home_location"><%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'users', :action => 'account', :display_name => current_user.display_name)) %></p>
       </div>
     <% else %>
       <% content_for :head do %>