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

Update translation keys for renaming of user#view to user#show

Browse source
This commit is contained in:
Tom Hughes 2018-09-11 16:33:46 +01:00
parent 5becbc6ee0
commit f906373be2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/user/_contact.html.erb
View file

@ -14,16 +14,16 @@
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
<% distance = @user.distance(contact) %> <% distance = @user.distance(contact) %>
<% if distance < 1 %> <% if distance < 1 %>
(<%= t 'user.view.m away', :count => (distance * 1000).round %>) (<%= t 'user.show.m away', :count => (distance * 1000).round %>)
<% else %> <% else %>
(<%= t 'user.view.km away', :count => distance.round %>) (<%= t 'user.show.km away', :count => distance.round %>)
<% end %> <% end %>
<% end %> <% end %>
</p> </p>
<p> <p>
<% changeset = contact.changesets.first %> <% changeset = contact.changesets.first %>
<% if changeset %> <% if changeset %>
<%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> <%= t('user.show.latest edit', :ago => t('user.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %> <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
"<%= link_to(comment, "<%= link_to(comment,
{:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:controller => 'browse', :action => 'changeset', :id => changeset.id},
@ -35,12 +35,12 @@
</p> </p>
<ul class='secondary-actions clearfix deemphasize'> <ul class='secondary-actions clearfix deemphasize'>
<li><%= link_to t('user.view.send message'), new_message_path(contact) %></li> <li><%= link_to t('user.show.send message'), new_message_path(contact) %></li>
<li> <li>
<% if current_user.is_friends_with?(contact) %> <% if current_user.is_friends_with?(contact) %>
<%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <%= link_to t('user.show.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% else %> <% else %>
<%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <%= link_to t('user.show.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
<% end %> <% end %>
</li> </li>
</ul> </ul>