X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ba5107ebb543a396fc78069c75c431e4d3887ee1..db5c58ed09ed7f767a340ef889a29b6282505b82:/app/assets/javascripts/templates/notes/show.jst.ejs
diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index d85d78592..6d3a9b3bf 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,25 +1,24 @@
<%- I18n.t('javascripts.notes.show.title', { id: note.id }) %>
<% note.comments.forEach(function (comment) { %>
-
+
<% if (comment.user) { %>
- <%- I18n.t('javascripts.notes.show.event', {
- action: comment.action, user: comment.user, time: comment.date
+ <%= I18n.t('javascripts.notes.show.' + comment.action + '_by', {
+ user: comment.user, user_url: comment.user_url, time: comment.date
}) %>
<% } else { %>
- <%- I18n.t('javascripts.notes.show.anonymous_event', {
- action: comment.action, time: comment.date
+ <%- I18n.t('javascripts.notes.show.' + comment.action + '_by_anonymous', {
+ time: comment.date
}) %>
<% } %>
-
- <%- comment.text %>
-
+
<%= comment.html %>
+
<% }) %>
<% if (note.status == "open") { %>