X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/16c3c533022d90cbfafecd17349d09fcbb7abed9..3a5f0c4845ea7712e26f625c58424c309cf06881:/app/helpers/changesets_helper.rb diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index 97a70f789..dbee08c50 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -10,25 +10,23 @@ module ChangesetsHelper end def changeset_details(changeset) - if changeset.closed_at > Time.now + if changeset.closed_at > Time.now.utc action = :created - time = time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago') + 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 = "#{t('browse.created')}: #{l(changeset.created_at)} #{t('browse.closed')}: #{l(changeset.closed_at)}".html_safe + time = time_ago_in_words(changeset.closed_at, :scope => :"datetime.distance_in_words_ago") + title = safe_join([t("changesets.show.created", :when => l(changeset.created_at)), " ".html_safe, t("changesets.show.closed", :when => l(changeset.closed_at))]) + datetime = changeset.closed_at.xmlschema end if params.key?(:display_name) - t "browse.#{action}_html", - :time => time, - :title => title + t "changesets.show.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime) else - t "browse.#{action}_by_html", - :time => time, - :title => title, - :user => changeset_user_link(changeset) + t "changesets.show.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime), + :user => changeset_user_link(changeset) end end