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

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

diff --git a/app/views/user_mailer/friendship_notification.text.erb b/app/views/user_mailer/friendship_notification.text.erb
index da859d31c7b25bfa4cb457659a480eddd5669d41..104b0f1c925f63a2c4820974c69dd986249647b7 100644 (file)
--- a/app/views/user_mailer/friendship_notification.text.erb
+++ b/app/views/user_mailer/friendship_notification.text.erb
@@ -1,7 +1,9 @@
+<%= t ".hi", :to_user => @friendship.befriendee.display_name %>
+

 <%= t '.had_added_you', :user => @friendship.befriender.display_name %>
 
 <%= t '.see_their_profile', :userurl => @viewurl %>
 
 <%= t '.had_added_you', :user => @friendship.befriender.display_name %>
 
 <%= t '.see_their_profile', :userurl => @viewurl %>
 

-<% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
+<% unless @friendship.befriendee.friends_with?(@friendship.befriender) -%>

 <%= t '.befriend_them', :befriendurl => @friendurl %>
 <% end -%>
 <%= t '.befriend_them', :befriendurl => @friendurl %>
 <% end -%>