X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c79686f3cef86330d0ab6bbef2a9e2275ac93ac..8d76be71bbb8a799cbf0627dee170f26ade5a11f:/app/views/users/_contact.html.erb diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index 9950da0f8..c7e10c060 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -4,11 +4,11 @@ :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 %> +<%= 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 %> @@ -21,17 +21,17 @@

<% 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") %> - "<%= link_to(comment, - { :controller => "browse", :action => "changeset", :id => changeset.id }, - { :title => t("changesets.changeset.view_changeset_details") }) %>" + <%= 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 == "" ? t("browse.no_comment") : changeset.tags["comment"] %> + <%= link_to(comment, + { :controller => "browse", :action => "changeset", :id => changeset.id }, + { :title => t("changesets.changeset.view_changeset_details") }) %> <% else %> <%= t "changesets.changeset.no_edits" %> <% end %>

-