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

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

diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb
index ad219655e949238348d6233642e9d5d3f0bf71dd..da9ae75c921b5b50c7c09df849e63649bb521252 100644 (file)
--- a/app/views/user/_user.html.erb
+++ b/app/views/user/_user.html.erb
@@ -7,13 +7,13 @@
   <td>
     <p>
       <% if user.creation_ip %>
   <td>
     <p>
       <% if user.creation_ip %>

-        <%= raw t 'user.list.summary',
+        <%= raw t 'user.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 %>
             :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 %>

-        <%= raw t 'user.list.summary_no_ip',
+        <%= raw t 'user.index.summary_no_ip',

             :name => link_to(h(user.display_name), user_path(user)),
             :date => l(user.creation_time, :format => :friendly)
         %>
             :name => link_to(h(user.display_name), user_path(user)),
             :date => l(user.creation_time, :format => :friendly)
         %>