X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..0d3382015025b1a930a4667bde03f4b26003904b:/app/helpers/changesets_helper.rb?ds=sidebyside diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index 97a70f789..9d46de120 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -10,25 +10,21 @@ 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) 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("browse.created"), ": ", l(changeset.created_at), " ".html_safe, t("browse.closed"), ": ", l(changeset.closed_at)]) end if params.key?(:display_name) - t "browse.#{action}_html", - :time => time, - :title => title + t "browse.#{action}_ago_html", :time_ago => tag.abbr(time, :title => title) else - t "browse.#{action}_by_html", - :time => time, - :title => title, - :user => changeset_user_link(changeset) + t "browse.#{action}_ago_by_html", :time_ago => tag.abbr(time, :title => title), + :user => changeset_user_link(changeset) end end