Merge branch 'master' into openid

[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 8917061f1444d3e556ee824c1d374696da85a74b..ca77547570a6f543f4e7694ba7c7a0fb1da12b3f 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,4 +1,20 @@
-<%= t'notifier.friend_notification.had_added_you', :user => @user %>
+<%=
+  t 'notifier.friend_notification.had_added_you',
+     :user => @friend.befriender.display_name
+%>
 
-<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %>
+<%=
+  t 'notifier.friend_notification.see_their_profile',
+     :userurl => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "view",
+                         :display_name => @friend.befriender.display_name)
+%>
 
+<%=
+  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
+%>