JSON: return HTTP 406 for unsupported formats

[rails.git] / app / views / users / _contact.html.erb

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index d75e717add7245350857ac63c9109f1fa3daafcb..1479a1e4fbbd652e4f64021efed01a1f1bf963b4 100644 (file)
--- 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 %>
   <div class='activity-details'>
@@ -23,7 +21,7 @@
     <p>
       <% 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 },