X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73b59c5859ab128f61a456699f3c809bbb15558a..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 cf5d9010a..63177012c 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,10 +1,41 @@
-
Note <%- note.id %>
-<% note.comments.forEach(function (comment) { %>
-
-
- <%- comment.action %> by <%- comment.user %> at <%- comment.date %>
-
-
- <%- comment.text %>
-
-<% }) %>
+
+
<%- 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) { %>
+
+
+ <% 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.html %>
+
+ <% }) %>
+ <% if (note.status == "open") { %>
+
+ <% } else { %>
+
+ <% } %>
+