X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e9bea64bf6806be1b0a951fd684fa13314cb8b67..35785067979a410f2a3f78927d50869ee398f349:/app/views/user/view.rhtml diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 509630643..7113fc39c 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -4,14 +4,14 @@ <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> | <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> -| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list_user', :display_name => @user.display_name %> +| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name, :format => 'rhtml' %> | <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> <% else %> <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %> | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> -| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %> +| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name, :format => 'rhtml' %> | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :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 %> @@ -71,7 +71,7 @@ <% end %> <%= link_to h(@friend.display_name), :controller => 'user', :action => 'view', :display_name => @friend.display_name %> - <% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :distance => l(@this_user.distance(@friend).round) %><% end %> + <% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :distance => @this_user.distance(@friend).round %><% end %> (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>) <%end%> @@ -93,7 +93,7 @@ <% @this_user.nearby.each do |nearby| %> <%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %> - <%= t 'user.view.no nearby users', :distance => l(@this_user.distance(nearby).round) %> + <%= t 'user.view.km away', :distance => @this_user.distance(nearby).round %> (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>) <% end %>