Revert to using join instead of to_sentence for now as to_sentence is

[rails.git] / app / views / notifier / diary_comment_notification.rhtml

diff --git a/app/views/notifier/diary_comment_notification.rhtml b/app/views/notifier/diary_comment_notification.rhtml
index 1e821412c22010ad8d1598f1b572c64e7a0c7a55..a052ad79390f5ff396688b0e57e2d8c15088a256 100644 (file)
--- a/app/views/notifier/diary_comment_notification.rhtml
+++ b/app/views/notifier/diary_comment_notification.rhtml
@@ -1,38 +1,25 @@
 ***************************************************************************
 ***************************************************************************

-Please do not reply to this email. Use the OpenStreetMap web site to reply.
-***************************************************************************
-***************************************************************************
-Please do not reply to this email. Use the OpenStreetMap web site to reply.
-***************************************************************************
-***************************************************************************
-Please do not reply to this email. Use the OpenStreetMap web site to reply.
-***************************************************************************
-***************************************************************************
-Please do not reply to this email. Use the OpenStreetMap web site to reply.
+*                                                                         *
+<%= t'notifier.diary_comment_notification.banner1' %>
+<%= t'notifier.diary_comment_notification.banner2' %>
+*                                                                         *

 ***************************************************************************
 
 ***************************************************************************
 

-Hi <%= @to_user %>,

 
 

-<%= @from_user %> has commented on your recent OpenStreetMap diary entry
-with the subject "<%= @subject %>":
+<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> 
+
+<%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %>

 
 ==
 <%= @body %>
 ==
 
 
 ==
 <%= @body %>
 ==
 

-You can also read the comment at <%= @readurl %>
-and you can comment at <%= @commenturl %>
-or reply at <%= @replyurl %>
+<%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
+

 
 ***************************************************************************
 
 ***************************************************************************

-Please do not reply to this email. Use the OpenStreetMap web site to reply.
-***************************************************************************
-***************************************************************************
-Please do not reply to this email. Use the OpenStreetMap web site to reply.
-***************************************************************************
-***************************************************************************
-Please do not reply to this email. Use the OpenStreetMap web site to reply.
-***************************************************************************
-***************************************************************************
-Please do not reply to this email. Use the OpenStreetMap web site to reply.
+*                                                                         *
+<%= t'notifier.diary_comment_notification.banner1' %>
+<%= t'notifier.diary_comment_notification.banner2' %>
+*                                                                         *

 ***************************************************************************
 ***************************************************************************