From 3bc2b321118a1711376fbfaac72a6e5494e388a0 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 15 Jul 2020 15:12:30 +0200 Subject: [PATCH 1/1] Rephrase 'replying' text to clarify what will actually happen Fixes #2166 --- config/locales/en.yml | 6 +++--- test/system/diary_entry_test.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 -- 2.45.2