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

Avoid raw html in translations for changeset comments

Browse source
This commit is contained in:
Andy Allan 2023-03-22 18:07:49 +00:00
parent dff0c82f17
commit a859fe1acf
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,9 +38,9 @@
<% if comment.visible %> <% if comment.visible %>
<li id="c<%= comment.id %>"> <li id="c<%= comment.id %>">
<small class='text-muted'> <small class='text-muted'>
<%= t(".commented_by_html", <%= t(".comment_by_html",
:when => friendly_date_ago(comment.created_at), :time_ago => tag.abbr(friendly_date_ago(comment.created_at),
:exact_time => l(comment.created_at), :title => l(comment.created_at)),
:user => link_to(comment.author.display_name, user_path(comment.author))) %> :user => link_to(comment.author.display_name, user_path(comment.author))) %>
<% if current_user and current_user.moderator? %> <% if current_user and current_user.moderator? %>
— <span class="action-button" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span> — <span class="action-button" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
@ -51,9 +51,9 @@
<% elsif current_user and current_user.moderator? %> <% elsif current_user and current_user.moderator? %>
<li id="c<%= comment.id %>"> <li id="c<%= comment.id %>">
<small class='text-muted'> <small class='text-muted'>
<%= t(".hidden_commented_by_html", <%= t(".hidden_comment_by_html",
:when => friendly_date_ago(comment.created_at), :time_ago => tag.abbr(friendly_date_ago(comment.created_at),
:exact_time => l(comment.created_at), :title => l(comment.created_at)),
:user => link_to(comment.author.display_name, user_path(comment.author))) %> :user => link_to(comment.author.display_name, user_path(comment.author))) %>
— <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span> — <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
</small> </small>

4
config/locales/en.yml
View file

@ -333,8 +333,8 @@ en:
relation: "Relations (%{count})" relation: "Relations (%{count})"
relation_paginated: "Relations (%{x}-%{y} of %{count})" relation_paginated: "Relations (%{x}-%{y} of %{count})"
comment: "Comments (%{count})" comment: "Comments (%{count})"
hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>" hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>" comment_by_html: "Comment from %{user} %{time_ago}"
changesetxml: "Changeset XML" changesetxml: "Changeset XML"
osmchangexml: "osmChange XML" osmchangexml: "osmChange XML"
feed: feed: