X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ba9456066f74814fe4e8929a4467caa2c5c6ba9f..d1cc387080152269cb142d150e06b0a27f8b98be:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 1227c0dd6..ac8a47069 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,29 +1,41 @@ -
-

<%= t 'browse.changeset.changeset', :id => @changeset.id %> - -

-

- <% +

<%= t 'browse.changeset.changeset', :id => @changeset.id %> + +

+
+

+ <%= + if @changeset.tags['comment'].to_s != '' + @changeset.tags['comment'].to_s + else + t ('browse.changeset_details.no_comment') + end + %> +

+ + <% 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' %> - - <%= created_at %> ago - <% else %> - <%= t 'browse.changeset_details.created_at' %> <%= created_at %> ago, - <%= t 'browse.changeset_details.closed_at' %> <%= closed_at %> ago - <% 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 %> -

+ if created_at == closed_at + %> + <%= t 'browse.changeset_details.closed_at' %> + + <%= t('browse.changeset_details.ago', :ago => created_at) %> + <% else %> + <%= t 'browse.changeset_details.created_at' %> <%= t('browse.changeset_details.ago', :ago => created_at) %>, + <%= t 'browse.changeset_details.closed_at' %> <%= t('browse.changeset_details.ago', :ago => closed_at) %> + <% 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 %> +
-<%= render :partial => "tag_details", :object => @changeset %> +<%= + render :partial => "tag_details", :object => @changeset.tags.except('comment') +%> <% unless @nodes.empty? %> -
+

<%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %>

    <% @nodes.each do |node| %> @@ -35,7 +47,7 @@ <% end %> <% unless @ways.empty? %> -
    +

    <%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>

      <% @ways.each do |way| %> @@ -47,7 +59,7 @@ <% end %> <% unless @relations.empty? %> -
      +

      <%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %>

        <% @relations.each do |relation| %> @@ -58,7 +70,7 @@
      <% end %> -
      +
      <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> · <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>