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

Avoid using raw html in translations for the issues index

Browse source
This commit is contained in:
Andy Allan 2023-03-22 17:34:16 +00:00
parent 92e3e425f1
commit dff0c82f17
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/issues/index.html.erb
View file

@ -61,13 +61,13 @@
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td> <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td> <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
<td> <td>
<% time_ago_tag = tag.abbr(time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"),
:title => l(issue.updated_at)) %>
<% if issue.user_updated %> <% if issue.user_updated %>
<%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)), <%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
:time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), :time_ago => time_ago_tag %>
:title => l(issue.updated_at) %>
<% else %> <% else %>
<%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), <%= time_ago_tag %>
:title => l(issue.updated_at) %>
<% end %> <% end %>
</td> </td>
</tr> </tr>

3
config/locales/en.yml
View file

@ -1387,8 +1387,7 @@ en:
status: Status status: Status
reports: Reports reports: Reports
last_updated: Last Updated last_updated: Last Updated
last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>" last_updated_time_ago_user_html: "%{time_ago} by %{user}"
last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
link_to_reports: View Reports link_to_reports: View Reports
reports_count: reports_count:
one: "%{count} Report" one: "%{count} Report"