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

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

diff --git a/app/views/notifier/diary_comment_notification.text.erb b/app/views/notifier/diary_comment_notification.text.erb
index efdd620e6f763e5c2d5f01a5521f906b63fa2f92..b86c303ae8bfdfb83f14d3a3826e7455bec869b6 100644 (file)
--- a/app/views/notifier/diary_comment_notification.text.erb
+++ b/app/views/notifier/diary_comment_notification.text.erb
@@ -1,9 +1,9 @@
-<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> 
+<%= t '.hi', :to_user => @to_user %>
 
-<%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %>
+<%= t '.header', :from_user => @from_user, :subject => @title %>
 
 ==
-<%= @body %>
+<%= raw @text.to_text %>
 ==
 
-<%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
+<%= t '.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>