Merge branch 'master' into next

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

diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index e37f682a33287ea5bf837a4871a70f3837b4673b..163223b44584cbd2fe92df87b920db081cf85474 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,16 +1,16 @@
-<p style="margin: 0">
-  <%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %>
+<p>
+  <%= t '.hi', :to_user => @to_user %>

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

-  <%= raw t'notifier.diary_comment_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>
 
 </p>
 

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

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

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

 
 <% content_for :footer do %>
 
 <% content_for :footer do %>

-  <p><%= raw t'notifier.diary_comment_notification.footer',
+  <p><%= raw t '.footer',

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