From b69e8b5c42b4bd184199757263ca05e1d7db43a9 Mon Sep 17 00:00:00 2001 From: Herve Saint-Amand Date: Mon, 27 Feb 2017 22:36:09 +0000 Subject: [PATCH] Included greeting string in changeset_comment_notification email --- app/models/notifier.rb | 1 + app/views/notifier/changeset_comment_notification.html.erb | 3 +++ app/views/notifier/changeset_comment_notification.text.erb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 1eb39e678..8f9e3e295 100644 --- 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 + @to_user = recipient.display_name @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 19ca33d85..80f9d8aa1 100644 --- a/app/views/notifier/changeset_comment_notification.html.erb +++ b/app/views/notifier/changeset_comment_notification.html.erb @@ -1,3 +1,6 @@ +

+ <%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %> +

<% 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 5da6feddc..af1176b53 100644 --- 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 %> -- 2.43.2