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

Fix double escaping of date markup in note feed

Browse source
This commit is contained in:
Tom Hughes 2013-05-07 11:23:40 +01:00
parent e84b2bd22f
commit 621cb8a1ef
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/notes/_comment.html.erb
View file

@ -1,8 +1,8 @@
<div class="note-comment" style="margin-top: 5px">
<% if comment.author.nil? -%>
<div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at", :when => friendly_date(comment.created_at) %></div>
<div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_html", :when => friendly_date(comment.created_at) %></div>
<% else -%>
<div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_by", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
<div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
<% end -%>
<div class="note-comment-text"><%= comment.body %></div>
</div>

16
config/locales/en.yml
View file

@ -1992,14 +1992,14 @@ en:
needs_view: "The user needs to log in before this block will be cleared."
note:
description:
opened_at: "Created %{when} ago"
opened_at_by: "Created %{when} ago by %{user}"
commented_at: "Updated %{when} ago"
commented_at_by: "Updated %{when} ago by %{user}"
closed_at: "Resolved %{when} ago"
closed_at_by: "Resolved %{when} ago by %{user}"
reopened_at: "Reactivated %{when} ago"
reopened_at_by: "Reactivated %{when} ago by %{user}"
opened_at_html: "Created %{when} ago"
opened_at_by_html: "Created %{when} ago by %{user}"
commented_at_html: "Updated %{when} ago"
commented_at_by_html: "Updated %{when} ago by %{user}"
closed_at_html: "Resolved %{when} ago"
closed_at_by_html: "Resolved %{when} ago by %{user}"
reopened_at_html: "Reactivated %{when} ago"
reopened_at_by_html: "Reactivated %{when} ago by %{user}"
rss:
title: "OpenStreetMap Notes"
description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"