X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..f75eb6fe9ef1e0a755c1a1810c5ca15ed58d9d08:/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 d75e717ad..8379bcd07 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -1,16 +1,14 @@ -<% - 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 %>

- <%= link_to h(contact.display_name), user_path(contact) %> + <%= link_to contact.display_name, user_path(contact) %> <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% distance = @user.distance(contact) %> <% if distance < 1 %> @@ -23,7 +21,7 @@

<% 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))) %> + <%= 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 },