From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Feb 2017 00:21:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1469'
X-Git-Tag: live~4623
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56e96d856c7fc168b37cf9d26a58a6da8094cedb?hp=d13348c0ea27cdb33153564aacf3130b0432157c

Merge remote-tracking branch 'openstreetmap/pull/1469'
---

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 @@
+<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 %>
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 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c709726ac..d71568ceb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1243,6 +1243,7 @@ en:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
+      hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."