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

[rails.git] / app / views / user_mailer / friendship_notification.html.erb

diff --git a/app/views/user_mailer/friendship_notification.html.erb b/app/views/user_mailer/friendship_notification.html.erb
index 24587a6e3a42c308a0472efaf9f1389c31b5031f..40af762d70ff6f0698c0e2bb28c6e6b3b0f62c27 100644 (file)
--- a/app/views/user_mailer/friendship_notification.html.erb
+++ b/app/views/user_mailer/friendship_notification.html.erb
@@ -1,9 +1,11 @@
+<p><%= t ".hi", :to_user => @friendship.befriendee.display_name %></p>
+
 <p><%= t ".had_added_you", :user => @friendship.befriender.display_name %></p>
 
 <%= message_body do %>
-  <p><%= raw t ".see_their_profile", :userurl => link_to(@viewurl, @viewurl) %></p>
+  <p><%= t ".see_their_profile_html", :userurl => link_to(@viewurl, @viewurl) %></p>
 
-  <% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
-  <p><%= raw t ".befriend_them", :befriendurl => link_to(@friendurl, @friendurl) %></p>
+  <% unless @friendship.befriendee.friends_with?(@friendship.befriender) -%>
+  <p><%= t ".befriend_them_html", :befriendurl => link_to(@friendurl, @friendurl) %></p>
   <% end -%>
 <% end %>