X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3ec67ea2d395f9ae78f806f8e583e10d691861de..5029db24fa9a5b67cdbc52cb97fc359463785dc5:/app/views/users/_contact.html.erb?ds=sidebyside diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index bcc2faf35..1eef86b87 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -3,10 +3,10 @@ :lon => contact.home_lon, :lat => contact.home_lat, :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), - :description => render(:partial => "popup", :object => contact, :locals => {:type => type}) + :description => render(:partial => "popup", :object => contact, :locals => { :type => type }) } %> -<%= content_tag :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %> +<%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %> <%= user_thumbnail contact %>

@@ -14,23 +14,22 @@ <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% distance = @user.distance(contact) %> <% if distance < 1 %> - (<%= t 'user.show.m away', :count => (distance * 1000).round %>) + (<%= t 'users.show.m away', :count => (distance * 1000).round %>) <% else %> - (<%= t 'user.show.km away', :count => distance.round %>) + (<%= t 'users.show.km away', :count => distance.round %>) <% end %> <% end %>

<% changeset = contact.changesets.first %> <% if changeset %> - <%= t('user.show.latest edit', :ago => t('user.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> + <%= t('users.show.latest edit', :ago => t('users.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') %> "<%= link_to(comment, - {:controller => 'browse', :action => 'changeset', :id => changeset.id}, - {:title => t('changeset.changeset.view_changeset_details')}) - %>" + { :controller => 'browse', :action => 'changeset', :id => changeset.id }, + { :title => t('changesets.changeset.view_changeset_details') }) %>" <% else %> - <%= t'changeset.changeset.no_edits' %> + <%= t 'changesets.changeset.no_edits' %> <% end %>