From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Jul 2020 13:37:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2710'
X-Git-Tag: live~2187
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c87d316a1d65ce7fa4b47a6027b2ea5a7b3dbbcc?hp=5cc4e933479b7e74ed7d4425909f0915717fc1db

Merge remote-tracking branch 'upstream/pull/2710'
---

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9142c2eda..30e8f6e98 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -394,7 +394,7 @@ en:
     diary_entry:
       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      reply_link: Send a message to the author
       comment_count:
         zero: No comments
         one: "%{count} comment"
@@ -1197,12 +1197,12 @@ en:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
-      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
+      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       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}"
+      footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
     friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index 38e2a1847..d60812e4c 100644
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -10,7 +10,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
-    click_on "Reply to this entry"
+    click_on "Send a message to the author"
 
     assert page.has_content? "Send a new message"
     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value