X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6baccfaddd190d730b626204e9cf81c2504995bf..9a32033209545a69d60cbd551e6bd975cda64341:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 0dbc09dd3..e50610037 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -71,7 +71,16 @@ <% 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', :count => @this_user.distance(@friend).round %><% end %> + + <% if @friend.home_lon and @friend.home_lat %> + <% distance = @this_user.distance(@friend) %> + <% if distance < 1 %> + <%= t 'user.view.m away', :count => (distance * 1000).round %> + <% else %> + <%= t 'user.view.km away', :count => distance.round %> + <% end %> + <% end %> + (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>) <%end%> @@ -93,7 +102,14 @@ <% @this_user.nearby.each do |nearby| %> <%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %> - <%= t 'user.view.km away', :count => @this_user.distance(nearby).round %> + + <% distance = @this_user.distance(nearby) %> + <% if distance < 1 %> + <%= t 'user.view.m away', :count => (distance * 1000).round %> + <% else %> + <%= t 'user.view.km away', :count => distance.round %> + <% end %> + (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>) <% end %>