X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/866f25bc45b01776f6319fda7f6b91da43710ec0..52452d95b452419e003a2e59fa559635fa5748e3:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 834e8571b..15112c2c3 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -41,7 +41,7 @@ | <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> | - <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> + <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> | <% if @user and @user.is_friends_with?(@this_user) %> <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> @@ -92,7 +92,7 @@ <% if @user and @this_user.id == @user.id %>
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> -

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

+

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

<% else %> <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> <% end %>