Use {{count}} instead of {{distance}} for kilometer count as {{count}} is a magical...

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 37954e54baabffc30116ab868ee6a26c42696a5c..36bba478c12f625687d835e8554a7d62e9f60815 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -71,7 +71,7 @@
       <% end %>
       </td>
       <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
       <% 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', :distance => @this_user.distance(@friend).round %><% end %></td>
+      <td><% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :count => @this_user.distance(@friend).round %><% end %></td>

       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
       <%end%>
       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
       <%end%>


@@ -93,7 +93,7 @@
       <% @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>
       <% @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', :distance => @this_user.distance(nearby).round %></td>
+      <td><%= t 'user.view.km away', :count => @this_user.distance(nearby).round %></td>

       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
       </tr>
       <% end %>
       <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/be.yml b/config/locales/be.yml
index 1ea64082ac121caa2080dc417a26e0bed27c80e9..e328761f240f00987ab51f046fa9dd5af01dc0b6 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -578,7 +578,7 @@ be:
       settings_link_text: настаўленняў
       your friends: Вашыя сябры
       no friends: Вы пакуль не дадалі нікога ў сябры.
       settings_link_text: настаўленняў
       your friends: Вашыя сябры
       no friends: Вы пакуль не дадалі нікога ў сябры.

-      km away: "{{distance}} км ад вас"
+      km away: "{{count}} км ад вас"

       nearby users: "Карыстальнікі непадалёку: "
       no nearby users: "Пакуль няма карыстальнікаў, што адмецілі сваё месцазнаходжанне непадалёку."
       change your settings: змяніць вашыя настаўленні
       nearby users: "Карыстальнікі непадалёку: "
       no nearby users: "Пакуль няма карыстальнікаў, што адмецілі сваё месцазнаходжанне непадалёку."
       change your settings: змяніць вашыя настаўленні

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 52d4bec8dbc183d9fbac94aec106db5f29a5f8f3..3ca866234f1eb65d19f703d33fa1a3d230890fcc 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -659,7 +659,7 @@ de:
       settings_link_text: Einstellungen
       your friends: Eigene Freunde
       no friends: Du hast bis jetzt keine Freunde hinzugefügt.
       settings_link_text: Einstellungen
       your friends: Eigene Freunde
       no friends: Du hast bis jetzt keine Freunde hinzugefügt.

-      km away: "{{distance}}km entfernt"
+      km away: "{{count}}km entfernt"

       nearby users: "Benutzer in der Nähe: "
       no nearby users: "Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben."
       change your settings: Ändere deine Einstellungen
       nearby users: "Benutzer in der Nähe: "
       no nearby users: "Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben."
       change your settings: Ändere deine Einstellungen

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bcbd161566a8988117282628565b7b4f437bc010..f828f1402f4a7e3261feeff67876ea91b77373b4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -707,7 +707,7 @@ en:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.

-      km away: "{{distance}}km away"
+      km away: "{{count}}km away"

       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings
       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/fr.yml b/config/locales/fr.yml
index 93d43e60e6c454e2c1f204588804126e829b68ee..a1c3c63aad7ea037a630c7a9f81d5aa3de99babc 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -221,7 +221,7 @@ fr:
       settings_link_text: "options"
       your friends: "Vos amis"
       no friends: "Vous n'avez pas encore ajouté d'ami"
       settings_link_text: "options"
       your friends: "Vos amis"
       no friends: "Vous n'avez pas encore ajouté d'ami"

-      km away: "{{distance}} km"
+      km away: "{{count}} km"

       nearby users: "Utilisateurs proches de vous : "
       no nearby users: "Il n'y a pas encore d'utilisateur à proximité."
       change your settings: "modifiez vos options"
       nearby users: "Utilisateurs proches de vous : "
       no nearby users: "Il n'y a pas encore d'utilisateur à proximité."
       change your settings: "modifiez vos options"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6ed96ccfbe1474d7ddd9a66bf7c6c384783821dc..c4dbd2a00c3f9ec89ab9698831c01b6ed818099a 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -581,7 +581,7 @@ he:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.

-      km away: "{{distance}}km away"
+      km away: "{{count}}km away"

       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings
       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 8f1473a5d3798b9b32d622c7629c264ef110a849..102c6e9f0f1d056877cb4088521fce70972987b9 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -658,7 +658,7 @@ is:
       settings_link_text: "stillingarsíðunni"
       your friends: Vinir þínir
       no friends: Þú átt enga vini
       settings_link_text: "stillingarsíðunni"
       your friends: Vinir þínir
       no friends: Þú átt enga vini

-      km away: "í {{distance}} km fjarlægð"
+      km away: "í {{count}} km 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"
       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"

diff --git a/config/locales/it.yml b/config/locales/it.yml
index e0dd8eaeb9d36df90e6d63727b4a254a3647b07b..39400ccbcb82ff76fdbe9a4d404a37a1eedef13f 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -579,7 +579,7 @@ it:
       settings_link_text: impostazioni
       your friends: Amici personali
       no friends: Non ci sono ancora amici.
       settings_link_text: impostazioni
       your friends: Amici personali
       no friends: Non ci sono ancora amici.

-      km away: "distante {{distance}} km"
+      km away: "distante {{count}} km"

       nearby users: "Utenti nelle vicinanze: "
       no nearby users: "Non c'è ancora alcun utente che ammette di mappare nelle vicinanze."
       change your settings: modifica le impostazioni personali
       nearby users: "Utenti nelle vicinanze: "
       no nearby users: "Non c'è ancora alcun utente che ammette di mappare nelle vicinanze."
       change your settings: modifica le impostazioni personali

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3dacc1941e2694344253a3aa58b636a864e97d42..9a2008b1c39d503d458e154426aa2ad067010070 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -579,7 +579,7 @@ nl:
       settings_link_text: instellingen-pagina
       your friends: Je vrienden
       no friends: Je hebt nog geen vrienden toegevoegd.
       settings_link_text: instellingen-pagina
       your friends: Je vrienden
       no friends: Je hebt nog geen vrienden toegevoegd.

-      km away: "{{distance}}km ver"
+      km away: "{{count}}km ver"

       nearby users: "Dichtbijzijnde mappers: "
       no nearby users: "Er zijn geen dichtbijzijnde mappers."
       change your settings: instellingen aanpassen
       nearby users: "Dichtbijzijnde mappers: "
       no nearby users: "Er zijn geen dichtbijzijnde mappers."
       change your settings: instellingen aanpassen

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8a7ccaeccedf8433742ae6f123e5f2c177331d4c..0766284a04958002f902143311548779e24b2d92 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -582,7 +582,7 @@ pl:
       settings_link_text: stronie ustawień
       your friends: Twoi znajomi
       no friends: Nie dodałeś/aś jeszcze żadnych znajomych.
       settings_link_text: stronie ustawień
       your friends: Twoi znajomi
       no friends: Nie dodałeś/aś jeszcze żadnych znajomych.

-      km away: "{{distance}}km z tąd"
+      km away: "{{count}}km z tąd"

       nearby users: "Najbliźsi użytkownicy: "
       no nearby users: "Nikt nie przyznał się jeszcze do mapowania w tej okolicy."
       change your settings: zmień swoje ustawienia
       nearby users: "Najbliźsi użytkownicy: "
       no nearby users: "Nikt nie przyznał się jeszcze do mapowania w tej okolicy."
       change your settings: zmień swoje ustawienia

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index a2aeef6bd7236c33414b3f935c1225d8c8b6db41..f25c8f47f0529101d6c3f60ec52ed6e0800833fb 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -579,7 +579,7 @@ ru:
       settings_link_text: настройки
       your friends: Ваши друзья
       no friends: Вы не добавили ещё ни одного друга.
       settings_link_text: настройки
       your friends: Ваши друзья
       no friends: Вы не добавили ещё ни одного друга.

-      km away: "{{distance}} км. от вас"
+      km away: "{{count}} км. от вас"

       nearby users: "Ближайшие пользователи: "
       no nearby users: "Поблизости пока нет пользователей, занимающихся составлением карты."
       change your settings: изменить настройки
       nearby users: "Ближайшие пользователи: "
       no nearby users: "Поблизости пока нет пользователей, занимающихся составлением карты."
       change your settings: изменить настройки

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a4d915ec28a1677436e4184a5d638383f487df8b..95438cc1fddeff839109815d0b3b94d560d51398 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -687,7 +687,7 @@ sl:
       settings_link_text: vaših nastavitvah
       your friends: Vaši prijatelji
       no friends: Niste še dodali nobenih prijateljev.
       settings_link_text: vaših nastavitvah
       your friends: Vaši prijatelji
       no friends: Niste še dodali nobenih prijateljev.

-      km away: "Oddaljen {{distance}} km"
+      km away: "Oddaljen {{count}} km"

       nearby users: "Bližnji uporabniki: "
       no nearby users: "Ni uporabnikov, ki bi priznali, da kartirajo v vaši bližini."
       change your settings: uredite vaše nastavitve
       nearby users: "Bližnji uporabniki: "
       no nearby users: "Ni uporabnikov, ki bi priznali, da kartirajo v vaši bližini."
       change your settings: uredite vaše nastavitve

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9886b19e0ea5e6fe9c5f70f508d6ab057160299f..91fe9e4e43d75e28dcf25a4328a65dd1f2f95168 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -567,7 +567,7 @@ zh-CN:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.

-      km away: "{{distance}}km away"
+      km away: "{{count}}km away"

       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings