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

Avoid wrapping time tags in abbr for note_helper

Browse source
This commit is contained in:
Andy Allan 2023-11-15 19:18:01 +00:00
parent 0d33820150
commit d739943b36
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/note_helper.rb
View file

@ -4,12 +4,10 @@ module NoteHelper
def note_event(event, at, by)
if by.nil?
t("notes.show.event_#{event}_by_anonymous_html",
:time_ago => tag.abbr(friendly_date_ago(at),
:title => l(at)))
:time_ago => friendly_date_ago(at))
else
t("notes.show.event_#{event}_by_html",
:time_ago => tag.abbr(friendly_date_ago(at),
:title => l(at)),
:time_ago => friendly_date_ago(at),
:user => note_author(by))
end
end

4
test/helpers/note_helper_test.rb
View file

@ -8,8 +8,8 @@ class NoteHelperTest < ActionView::TestCase
date = Time.utc(2014, 3, 5, 21, 37, 45)
user = create(:user)
assert_match %r{^Created by anonymous <abbr title="Wed, 05 Mar 2014 21:37:45 \+0000"><time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time></abbr>$}, note_event("opened", date, nil)
assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <abbr title="Wed, 05 Mar 2014 21:37:45 \+0000"><time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time></abbr>$}, note_event("closed", date, user)
assert_match %r{^Created by anonymous <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("opened", date, nil)
assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("closed", date, user)
end
def test_note_author