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

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

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index b9b7bc96345b259bece5f30784112788b11de970..beff4b0ae3572c16824eb31c795d0825692ebb97 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,4 +1,4 @@
-<% cl = cycle('table0', 'table1') %>
+<% cl = cycle("table0", "table1") %>

 
 <tr class="<%= cl %>">
   <td>
 
 <tr class="<%= cl %>">
   <td>


@@ -7,16 +7,14 @@
   <td>
     <p>
       <% if user.creation_ip %>
   <td>
     <p>
       <% if user.creation_ip %>

-        <%= raw t 'users.index.summary',
-            :name => link_to(h(user.display_name), user_path(user)),
-            :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
-            :date => l(user.creation_time, :format => :friendly)
-        %>
+        <%= raw t "users.index.summary",
+                  :name => link_to(h(user.display_name), user_path(user)),
+                  :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
+                  :date => l(user.creation_time, :format => :friendly) %>

       <% else %>
       <% else %>

-        <%= raw t 'users.index.summary_no_ip',
-            :name => link_to(h(user.display_name), user_path(user)),
-            :date => l(user.creation_time, :format => :friendly)
-        %>
+        <%= raw t "users.index.summary_no_ip",
+                  :name => link_to(h(user.display_name), user_path(user)),
+                  :date => l(user.creation_time, :format => :friendly) %>

       <% end %>
     </p>
     <div class="richtext"><%= user.description.to_html %></div>
       <% end %>
     </p>
     <div class="richtext"><%= user.description.to_html %></div>