cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use {{count}} instead of {{distance}} for kilometer count as {{count}} is a magical enumerated variable in Rails.

Browse source
This commit is contained in:
Ævar Arnfjörð Bjarmason 2009-06-07 22:14:22 +00:00
parent 32b422aefb
commit d8d3d21a2c
13 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/user/view.rhtml
View file

@ -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>
<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%>
@ -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>
<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 %>

2
config/locales/be.yml
View file

@ -578,7 +578,7 @@ be:
settings_link_text: настаўленняў
your friends: Вашыя сябры
no friends: Вы пакуль не дадалі нікога ў сябры.
km away: "{{distance}} км ад вас"
km away: "{{count}} км ад вас"
nearby users: "Карыстальнікі непадалёку: "
no nearby users: "Пакуль няма карыстальнікаў, што адмецілі сваё месцазнаходжанне непадалёку."
change your settings: змяніць вашыя настаўленні

2
config/locales/de.yml
View file

@ -659,7 +659,7 @@ de:
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

2
config/locales/en.yml
View file

@ -707,7 +707,7 @@ en:
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

2
config/locales/fr.yml
View file

@ -221,7 +221,7 @@ fr:
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"

2
config/locales/he.yml
View file

@ -581,7 +581,7 @@ he:
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

2
config/locales/is.yml
View file

@ -658,7 +658,7 @@ is:
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"

2
config/locales/it.yml
View file

@ -579,7 +579,7 @@ it:
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

2
config/locales/nl.yml
View file

@ -579,7 +579,7 @@ nl:
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

2
config/locales/pl.yml
View file

@ -582,7 +582,7 @@ pl:
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

2
config/locales/ru.yml
View file

@ -579,7 +579,7 @@ ru:
settings_link_text: настройки
your friends: Ваши друзья
no friends: Вы не добавили ещё ни одного друга.
km away: "{{distance}} км. от вас"
km away: "{{count}} км. от вас"
nearby users: "Ближайшие пользователи: "
no nearby users: "Поблизости пока нет пользователей, занимающихся составлением карты."
change your settings: изменить настройки

2
config/locales/sl.yml
View file

@ -687,7 +687,7 @@ sl:
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

2
config/locales/zh-CN.yml
View file

@ -567,7 +567,7 @@ zh-CN:
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