X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c77429000c55af95056572206a99774711c8d22b:/app/views/user/show.html.erb..3ec67ea2d395f9ae78f806f8e583e10d691861de:/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 30c72b140..7aa3abd27 100644 --- 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 %>
  • - <%= 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 %>
  • <% 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? %>
    -

    <%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %>

    +

    <%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'users', :action => 'account', :display_name => current_user.display_name)) %>

    <% else %> <% content_for :head do %>