cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2020-07-15 14:37:59 +01:00
commit c87d316a1d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/locales/en.yml
View file

@ -394,7 +394,7 @@ en:
diary_entry: diary_entry:
posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}" posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
comment_link: Comment on this entry comment_link: Comment on this entry
reply_link: Reply to this entry reply_link: Send a message to the author
comment_count: comment_count:
zero: No comments zero: No comments
one: "%{count} comment" one: "%{count} comment"
@ -1197,12 +1197,12 @@ en:
subject: "[OpenStreetMap] %{user} commented on a diary entry" subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user}," hi: "Hi %{to_user},"
header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" 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: message_notification:
subject_header: "[OpenStreetMap] %{subject}" subject_header: "[OpenStreetMap] %{subject}"
hi: "Hi %{to_user}," hi: "Hi %{to_user},"
header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" 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: friendship_notification:
hi: "Hi %{to_user}," hi: "Hi %{to_user},"
subject: "[OpenStreetMap] %{user} added you as a friend" subject: "[OpenStreetMap] %{user} added you as a friend"

2
test/system/diary_entry_test.rb
View file

@ -10,7 +10,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
sign_in_as(create(:user)) sign_in_as(create(:user))
visit diary_entries_path 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 page.has_content? "Send a new message"
assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value