X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5029db24fa9a5b67cdbc52cb97fc359463785dc5..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/app/views/users/_contact.html.erb?ds=inline diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index 1eef86b87..1479a1e4f 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -1,11 +1,9 @@ -<% - user_data = { +<% user_data = { :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 }) - } -%> + } %> <%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %> <%= user_thumbnail contact %>
<% changeset = contact.changesets.first %> <% if changeset %> - <%= 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') %> + <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %> + <% 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('changesets.changeset.view_changeset_details') }) %>" + { :controller => "browse", :action => "changeset", :id => changeset.id }, + { :title => t("changesets.changeset.view_changeset_details") }) %>" <% else %> - <%= t 'changesets.changeset.no_edits' %> + <%= t "changesets.changeset.no_edits" %> <% end %>