X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/de78176e04961c52f1fa1283812ec06ce6eb90cf..f1a4669c957d29c012466768581c4a801e5029be:/app/assets/javascripts/templates/notes/show.jst.ejs?ds=inline
diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index 8b95fea2e..63177012c 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,23 +1,40 @@
-
<%- I18n.t('javascripts.notes.show.title', { id: note.id }) %>
+
<%- I18n.t('javascripts.notes.show.permalink', { id: note.id }) %>
+ <% if (note.comments.some(function (comment) { return !comment.user })) { %>
+
<%- I18n.t('javascripts.notes.show.anonymous_warning') %>
+ <% } %>
<% note.comments.forEach(function (comment) { %>
-
+
- <%- I18n.t('javascripts.notes.show.event', {
- action: comment.action, user: comment.user, time: comment.date
- }) %>
+ <% if (comment.user) { %>
+ <%= I18n.t('javascripts.notes.show.' + comment.action + '_by', {
+ user: comment.user, user_url: comment.user_url,
+ time: I18n.l("time.formats.long", comment.date)
+ }) %>
+ <% } else { %>
+ <%- I18n.t('javascripts.notes.show.' + comment.action + '_by_anonymous', {
+ time: I18n.l("time.formats.long", comment.date)
+ }) %>
+ <% } %>
-
- <%- comment.text %>
-
+
<%= comment.html %>
+
<% }) %>
<% if (note.status == "open") { %>