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

[rails.git] / app / views / notifier / message_notification.html.erb

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index 97a352a499e7f51385c620f90385762d6097f90e..4e4b2ea9a993ff9cb97d4e8c76a923c931685b8c 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,8 +1,8 @@
 <p>
 <p>

-  <%= t'notifier.message_notification.hi', :to_user => @to_user %>
+  <%= t '.hi', :to_user => @to_user %>

 </p>
 <p>
 </p>
 <p>

-  <%= raw t'notifier.message_notification.header',
+  <%= raw t '.header',

           :from_user => link_to_user(@from_user),
           :subject => content_tag("em", @title)
   %>
           :from_user => link_to_user(@from_user),
           :subject => content_tag("em", @title)
   %>


@@ -14,7 +14,7 @@
 
 <% content_for :footer do %>
   <p>
 
 <% content_for :footer do %>
   <p>

-    <%= t'notifier.message_notification.footer_html',
+    <%= t '.footer_html',

           :readurl => link_to(@readurl, @readurl) + tag(:br),
           :replyurl => link_to(@replyurl, @replyurl)
     %>
           :readurl => link_to(@readurl, @readurl) + tag(:br),
           :replyurl => link_to(@replyurl, @replyurl)
     %>