Merge remote-tracking branch 'upstream/pull/2189'

[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 5c3afaa89c89831fc3e85c5c1a8d3d1e6c4361d9..1eef86b87ee1bf35bd5d6b82ffb6e32d6889b3a5 100644 (file)
--- 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 %>
   <div class='activity-details'>
     <p class='deemphasize'>
@@ -26,11 +26,10 @@
         <%= 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')})
-        %>"
+                     { :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 %>
     </p>