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 7a4ac66a5a79757ea751e7b4d5ffd6831ced091f..4e4b2ea9a993ff9cb97d4e8c76a923c931685b8c 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,20 +1,20 @@
-<p style="margin: 0">
-  <%= t'notifier.message_notification.hi', :to_user => @to_user %>
+<p>
+  <%= 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)
   %>
 </p>
 
           :from_user => link_to_user(@from_user),
           :subject => content_tag("em", @title)
   %>
 </p>
 

-<%= render "notifier/user_message_table", :captured => capture { %>
+<%= message_body do %>

   <%= @text.to_html %>
   <%= @text.to_html %>

-<% } %>
+<% end %>

 
 <% 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)
     %>