Rearrange issues table and combine some columns.

[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 7a495e648a48a9a81c7d4d2aa4da4eaf18f0ec9d..c006941d9ff63149b0379c7da05e77fe5b776cea 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'notifier.message_notification.hi', :to_user => @to_user %> 
 
-<%= t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
+<%= raw t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
 
 ==
-<%= raw @text %>
+<%= raw @text.to_text %>
 ==
 
-<%= t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= t'notifier.message_notification.footer2', :replyurl => @replyurl %>
+<%= word_wrap(t'notifier.message_notification.footer_html', :readurl => @readurl, :replyurl => @replyurl) %>