Merge branch 'master' into tag-colour-preview-rebase

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

diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb
index 8c5fce74e7c060a8647cf352ba9bdfac27e5db61..b3a74bb88d668be241b0e758d65aaca2a9a36de5 100644 (file)
--- a/app/views/notifier/message_notification.text.erb
+++ b/app/views/notifier/message_notification.text.erb
@@ -1,10 +1,9 @@
-<%= t'notifier.message_notification.hi', :to_user => @to_user %> 
+<%= raw t '.hi', :to_user => @to_user %>
 
-<%= t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
+<%= raw t '.header', :from_user => @from_user, :subject => @title %>
 
 ==
-<%= @body %>
+<%= raw @text.to_text %>
 ==
 
-<%= t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= t'notifier.message_notification.footer2', :replyurl => @replyurl %>
+<%= word_wrap(t '.footer_html', :readurl => @readurl, :replyurl => @replyurl) %>