When two users are <1 km apart display the distance between them in

meters, not kilometers.

Solves ticket:2028

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 5fdea140ff614bec8fe5a7088a5530a4bd4af8d6..1b582c0b9ff4272886ee308b6db46eef1fef1397 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -71,7 +71,16 @@
       <% end %>
       </td>
       <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
-      <td><% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :count => @this_user.distance(@friend).round %><% end %></td>
+      <td>
+        <% 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 %>
+      </td>
       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
       <%end%>
@@ -93,7 +102,14 @@
       <% @this_user.nearby.each do |nearby| %>
       <tr>
       <td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
-      <td><%= t 'user.view.km away', :count => @this_user.distance(nearby).round %></td>
+      <td>
+        <% 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 %>
+      </td>
       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
       </tr>
       <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dee97ab91addd251a09fbfd8c91eda49afcc27a9..c1a0d17f551bb43e3baa838037731f9dea336868 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -833,6 +833,7 @@ en:
       your friends: Your friends
       no friends: You have not added any friends yet.
       km away: "{{count}}km away"
+      m away: "{{count}}m away"
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 350bca8158d98300bf774d8633eff5b0b7a2aff0..3860c5b01978bff4b880a9044fe0b8111c13b0d3 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -827,6 +827,7 @@ is:
       your friends: Vinir þínir
       no friends: Þú átt enga vini
       km away: "í {{count}} km fjarlægð"
+      m away: "í {{count}} m fjarlægð"
       nearby users: "Nálægir notendur:"
       no nearby users: "Engir notendur hafa stillt staðsetningu sína nálægt þér."
       change your settings: "breyttu stillingunum þínum"