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

Split come changset display logic into a helper

Browse source
This commit is contained in:
Aaron Lidman 2013-11-06 13:47:10 -08:00
parent 4bb0785ad5
commit 694fa065c0
3 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/helpers/changeset_helper.rb Normal file
View file

@ -0,0 +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 << '&#10;'
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

24
app/views/browse/changeset.html.erb
View file

@ -4,30 +4,10 @@
<div class="browse-section">
<p>
<%=
if @changeset.tags['comment'].to_s != ''
@changeset.tags['comment'].to_s
else
t ('browse.changeset_details.no_comment')
end
@changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment')
%>
</p>
<h4>
<%
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
%>
<%= t 'browse.changeset_details.closed_at' %>
<abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= l @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= l @changeset.closed_at %>">
<%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>
<% else %>
<%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>,
<%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= t('browse.changeset_details.ago', :ago => closed_at) %><abbr>
<% end %>
<% if @changeset.user.data_public? %>
by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
<% end %>
</h4>
<span><%= changeset_time_ago(@changeset) %></span>
</div>
<%=

1
config/locales/en.yml
View file

@ -135,6 +135,7 @@ en:
has_relations: "Relations (%{count})"
no_comment: "(no comment)"
ago: "%{ago} ago"
by: "by"
common_details:
edited: "Edited"
deleted: "Deleted"