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

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

Browse source
This commit is contained in:
Tom Hughes 2019-06-26 11:22:19 +01:00
commit 16c3c53302
17 changed files with 57 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/users/_contact.html.erb
View file

@ -21,7 +21,7 @@
<p>
<% changeset = contact.changesets.first %>
<% if changeset %>
<%= t("users.show.latest edit", :ago => t("users.show.ago", :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<%= 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 },