Merge branch 'master' into convert_roundabout_exits

[rails.git] / app / views / notifier / friend_notification.text.erb

diff --git a/app/views/notifier/friend_notification.text.erb b/app/views/notifier/friend_notification.text.erb
index ca77547570a6f543f4e7694ba7c7a0fb1da12b3f..e1db966ab3adce85ea657ab80ca5e638d09cf7d5 100644 (file)
--- a/app/views/notifier/friend_notification.text.erb
+++ b/app/views/notifier/friend_notification.text.erb
@@ -1,20 +1,7 @@
-<%=
-  t 'notifier.friend_notification.had_added_you',
-     :user => @friend.befriender.display_name
-%>
+<%= t '.had_added_you', :user => @friend.befriender.display_name %>
 
-<%=
-  t 'notifier.friend_notification.see_their_profile',
-     :userurl => url_for(:host => SERVER_URL,
-                         :controller => "user", :action => "view",
-                         :display_name => @friend.befriender.display_name)
-%>
+<%= t '.see_their_profile', :userurl => @viewurl %>
 
-<%=
-  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
-%>
+<% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
+<%= t '.befriend_them', :befriendurl => @friendurl %>
+<% end -%>