Merge branch 'master' into convert_roundabout_exits

[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 cfea971958452e8e7a69dfebd1b3a8a56390ee51..f6774f2dc93efa042a7cd845b639d8f4de32d7b5 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,9 +1,9 @@
-<p><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
+<p><%= t '.had_added_you', :user => @friend.befriender.display_name %></p>

 
 <%= message_body do %>
 
 <%= message_body do %>

-  <p><%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
+  <p><%= raw t '.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>

 
   <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
 
   <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>

-  <p><%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
+  <p><%= raw t '.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>

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