From: Aaron Lidman Date: Wed, 6 Nov 2013 22:03:32 +0000 (-0800) Subject: Fix helper indendation width X-Git-Tag: live~4629^2~164 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/54c1ada23d98b8778a09800f442a9a6995a94a56?ds=sidebyside Fix helper indendation width --- diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb index 147624106..b71c35371 100644 --- a/app/helpers/changeset_helper.rb +++ b/app/helpers/changeset_helper.rb @@ -1,24 +1,24 @@ module ChangesetHelper - def changeset_time_ago(changeset) - out = '' - created_at = distance_of_time_in_words_to_now(changeset.created_at) - closed_at = distance_of_time_in_words_to_now(changeset.closed_at) - if created_at == closed_at - out << t('browse.changeset_details.closed_at') + ' ' - both_times = t('browse.changeset_details.created_at') + ': ' + l(changeset.created_at) - both_times << ' ' - both_times << t('browse.changeset_details.closed_at') + ': ' + l(changeset.closed_at) - out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe) - else - out << t('browse.changeset_details.created_at') + ' ' - out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at)) - out << t('browse.changeset_details.closed_at') + ' ' - out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => closed_at), title: l(changeset.closed_at)) - end - if changeset.user.data_public? - out << ' ' + t('browse.changeset_details.by') + ' ' - out << link_to(h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name) - end - return out.html_safe + def changeset_time_ago(changeset) + out = '' + created_at = distance_of_time_in_words_to_now(changeset.created_at) + closed_at = distance_of_time_in_words_to_now(changeset.closed_at) + if created_at == closed_at + out << t('browse.changeset_details.closed_at') + ' ' + both_times = t('browse.changeset_details.created_at') + ': ' + l(changeset.created_at) + both_times << ' ' + both_times << t('browse.changeset_details.closed_at') + ': ' + l(changeset.closed_at) + out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe) + else + out << t('browse.changeset_details.created_at') + ' ' + out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at)) + out << t('browse.changeset_details.closed_at') + ' ' + out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => closed_at), title: l(changeset.closed_at)) end + if changeset.user.data_public? + out << ' ' + t('browse.changeset_details.by') + ' ' + out << link_to(h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name) + end + return out.html_safe + end end