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

Use time instead of abbr element for changesets_helper

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

6
app/helpers/changesets_helper.rb
View file

@ -14,16 +14,18 @@ module ChangesetsHelper
action = :created
time = time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")
title = l(changeset.created_at)
datetime = changeset.created_at.xmlschema
else
action = :closed
time = time_ago_in_words(changeset.closed_at, :scope => :"datetime.distance_in_words_ago")
title = safe_join([t("browse.created"), ": ", l(changeset.created_at), "
".html_safe, t("browse.closed"), ": ", l(changeset.closed_at)])
datetime = changeset.closed_at.xmlschema
end
if params.key?(:display_name)
t "browse.#{action}_ago_html", :time_ago => tag.abbr(time, :title => title)
t "browse.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime)
else
t "browse.#{action}_ago_by_html", :time_ago => tag.abbr(time, :title => title),
t "browse.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime),
:user => changeset_user_link(changeset)
end
end

4
test/helpers/changesets_helper_test.rb
View file

@ -17,11 +17,11 @@ class ChangesetsHelperTest < ActionView::TestCase
# We need to explicitly reset the closed_at to some point in the future, and avoid the before_save callback
changeset.update_column(:closed_at, Time.now.utc + 1.day) # rubocop:disable Rails/SkipsModelValidations
assert_match %r{^Created <abbr title="Mon, 01 Jan 2007 00:00:00 \+0000">.*</abbr> by anonymous$}, changeset_details(changeset)
assert_match %r{^Created <time title="Mon, 01 Jan 2007 00:00:00 \+0000" datetime="2007-01-01T00:00:00Z">.*</time> by anonymous$}, changeset_details(changeset)
changeset = create(:changeset, :created_at => Time.utc(2007, 1, 1, 0, 0, 0), :closed_at => Time.utc(2007, 1, 2, 0, 0, 0))
user_link = %(<a href="/user/#{ERB::Util.u(changeset.user.display_name)}">#{changeset.user.display_name}</a>)
assert_match %r{^Closed <abbr title="Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000">.*</abbr> by #{user_link}$}, changeset_details(changeset)
assert_match %r{^Closed <time title="Created: Mon, 01 Jan 2007 00:00:00 \+0000&#10;Closed: Tue, 02 Jan 2007 00:00:00 \+0000" datetime="2007-01-02T00:00:00Z">.*</time> by #{user_link}$}, changeset_details(changeset)
end
end