Included greeting string in changeset_comment_notification email

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 1eb39e67844a8b2295f343284030d7b75c303f40..8f9e3e2954814e45151632c0ba88ca0db8fa6dfd 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -167,6 +167,7 @@ class Notifier < ActionMailer::Base
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do

+      @to_user = recipient.display_name

       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user

diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb
index 19ca33d85e2041b5b9546c98d98e3dfe2ecde3f5..80f9d8aa11b35a6e438f0b640bfb08bb8aec86df 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,3 +1,6 @@
+<p>
+  <%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %>
+</p>

 <p>
   <% if @owner %>
     <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
 <p>
   <% if @owner %>
     <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>

diff --git a/app/views/notifier/changeset_comment_notification.text.erb b/app/views/notifier/changeset_comment_notification.text.erb
index 5da6feddcb0985ab14a2b969097b943de4df1c82..af1176b53f4ad7d7704d4e4d2815b14926e3f166 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.text.erb
+++ b/app/views/notifier/changeset_comment_notification.text.erb
@@ -1,4 +1,4 @@
-<%= t 'notifier.changeset_comment_notification.greeting' %>
+<%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %>

 
 <% if @owner %>
   <%= t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => @commenter, :time => @time %>
 
 <% if @owner %>
   <%= t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => @commenter, :time => @time %>