Merge pull request #5437 from AntonKhorev/user-status-resource

[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..624ba92b76825610c8ef41c7c7276d064c0ee6cb 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 '.had_added_you', :user => @friendship.befriender.display_name %>
+<%= t ".hi", :to_user => @follow.following.display_name %>
+
+<%= t '.followed_you', :user => @follow.follower.display_name %>

 
 <%= t '.see_their_profile', :userurl => @viewurl %>
 
 
 <%= t '.see_their_profile', :userurl => @viewurl %>
 

-<% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
-<%= t '.befriend_them', :befriendurl => @friendurl %>
+<% unless @follow.following.friends_with?(@follow.follower) -%>
+<%= t '.follow_them', :followurl => @followurl %>

 <% end -%>
 <% end -%>