X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..330e2cc5214e309b349dee5a9401970fbab549bb:/app/helpers/changesets_helper.rb diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index 4a327c16c..970522160 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -3,32 +3,30 @@ module ChangesetsHelper if changeset.user.status == "deleted" t("users.no_such_user.deleted") elsif changeset.user.data_public? - link_to(changeset.user.display_name, user_path(changeset.user)) + link_to changeset.user.display_name, changeset.user else t("browse.anonymous") end end def changeset_details(changeset) - if changeset.closed_at > Time.now + if changeset.closed_at > Time.now.utc action = :created - time = distance_of_time_in_words_to_now(changeset.created_at) + 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 = distance_of_time_in_words_to_now(changeset.closed_at) - 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