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

[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 3f260dc9280fe12ba69922e6c383feb1343835c7..083f8d3fc8c2ff0a4b140cb490eae4f457adfa36 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,11 +1,9 @@
-<% content_for :body do %>
-  <p style="margin: 0"><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
+<p><%= t ".had_added_you", :user => @friend.befriender.display_name %></p>
 
-  <%= render "notifier/user_message_table", :captured => capture { %>
-    <p><%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
+<%= message_body do %>
+  <p><%= raw t ".see_their_profile", :userurl => link_to(@viewurl, @viewurl) %></p>
 
-    <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
-    <p><%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
-    <% end -%>
-  <% } %>
+  <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
+  <p><%= raw t ".befriend_them", :befriendurl => link_to(@friendurl, @friendurl) %></p>
+  <% end -%>
 <% end %>