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

[rails.git] / app / views / notifier / friend_notification.html.erb

diff --git a/app/views/notifier/friend_notification.html.erb b/app/views/notifier/friend_notification.html.erb
index ca77547570a6f543f4e7694ba7c7a0fb1da12b3f..083f8d3fc8c2ff0a4b140cb490eae4f457adfa36 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,20 +1,9 @@
-<%=
-  t 'notifier.friend_notification.had_added_you',
-     :user => @friend.befriender.display_name
-%>
+<p><%= t ".had_added_you", :user => @friend.befriender.display_name %></p>
 
-<%=
-  t 'notifier.friend_notification.see_their_profile',
-     :userurl => url_for(:host => SERVER_URL,
-                         :controller => "user", :action => "view",
-                         :display_name => @friend.befriender.display_name)
-%>
+<%= message_body do %>
+  <p><%= raw t ".see_their_profile", :userurl => link_to(@viewurl, @viewurl) %></p>
 
-<%=
-  unless @friend.befriendee.is_friends_with?(@friend.befriender)
-    t 'notifier.friend_notification.befriend_them',
-       :befriendurl => url_for(:host => SERVER_URL,
-                               :controller => "user", :action => "make_friend",
-                               :display_name => @friend.befriender.display_name)
-  end
-%>
+  <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
+  <p><%= raw t ".befriend_them", :befriendurl => link_to(@friendurl, @friendurl) %></p>
+  <% end -%>
+<% end %>