Merge remote-tracking branch 'upstream/pull/2838'

This commit is contained in:
Tom Hughes 2020-09-30 11:57:18 +01:00
commit 3b56c005eb
4 changed files with 15 additions and 13 deletions

View file

@ -1,21 +1,21 @@
<h4>
<h4 class="details">
<%= t "browse.version" %>
#<%= common_details.version %>
</h4>
<p class="font-italic">
<% if common_details.changeset.tags['comment'].present? %>
<%= linkify(common_details.changeset.tags["comment"]) %>
<% else %>
<%= t "browse.no_comment" %>
<% end %>
</h4>
</p>
<div class="details">
<%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
:time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'),
:user => changeset_user_link(common_details.changeset),
:title => l(common_details.timestamp) %>
</div>
<div class="details">
<%= t "browse.version" %>
#<%= common_details.version %>
&middot;
<%= t "browse.in_changeset" %>
#<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

View file

@ -6,7 +6,9 @@
</h2>
<div class="browse-section">
<h6><%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %></h6>
<p class="font-italic">
<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
</p>
<div class="details"><%= changeset_details(@changeset) %></div>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>

View file

@ -11,11 +11,11 @@
end %>
<%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
<h6>
<p class="font-italic">
<a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
<%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
</a>
</h6>
</p>
<div class="comments comments-<%= changeset.comments.length %>">
<%= changeset.comments.length %>
<span class="icon note grey"></span>

View file

@ -23,9 +23,9 @@
<% if changeset %>
<%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %>
<% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %>
"<%= link_to(comment,
{ :controller => "browse", :action => "changeset", :id => changeset.id },
{ :title => t("changesets.changeset.view_changeset_details") }) %>"
<q><%= link_to(comment,
{ :controller => "browse", :action => "changeset", :id => changeset.id },
{ :title => t("changesets.changeset.view_changeset_details") }) %></q>
<% else %>
<%= t "changesets.changeset.no_edits" %>
<% end %>