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

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

diff --git a/app/views/user/_popup.html.erb b/app/views/user/_popup.html.erb
index 8a63fbb25e4f66be57846530a33403d4b3c15f6c..957664b3bb78c5db8f90d24215d292c8817c40e4 100644 (file)
--- a/app/views/user/_popup.html.erb
+++ b/app/views/user/_popup.html.erb
@@ -1,5 +1,5 @@
 <div class="user_popup">
   <%= user_thumbnail popup %>
-  <p><%= t('user.popup.' + type) %></p>
-  <p><%= link_to popup.display_name, :controller => "user", :action => "view", :display_name => popup.display_name %></p>
+  <p><%= t('.' + type) %></p>
+  <p><%= link_to popup.display_name, user_path(popup) %></p>
 </div>