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

[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..d39ea40396be5b80a3f764f26890eaaef4e5c220 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,22 +1,20 @@
-<p style="margin: 0">
-  <%= t'notifier.message_notification.hi', :to_user => @to_user %>
+<p>
+  <%= t ".hi", :to_user => @to_user %>
 </p>
 <p>
-  <%= raw t'notifier.message_notification.header',
-          :from_user => link_to_user(@from_user),
-          :subject => content_tag("em", @title)
-  %>
+  <%= raw t ".header",
+            :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 %>
-<% } %>
+<% end %>
 
 <% 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)
-    %>
+          :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>