X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d57755b737cbb38a590b0e017a4b5c6c661aea62..c6cde2653b8dbcd3345348b33619b2240f1cc905:/app/assets/javascripts/templates/notes/show.jst.ejs?ds=sidebyside diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs index 2ae846b19..bea60ed4a 100644 --- a/app/assets/javascripts/templates/notes/show.jst.ejs +++ b/app/assets/javascripts/templates/notes/show.jst.ejs @@ -1,20 +1,41 @@ -

<%- I18n.t('javascripts.notes.show.title', { id: note.id }) %>

-<% note.comments.forEach(function (comment) { %> -

- - <%- I18n.t('javascripts.notes.show.event', { - action: comment.action, user: comment.user, time: comment.date - }) %> - -
- <%- comment.text %> -

-<% }) %> -<% if (note.status == "open") { %> -
- -
- - -
-<% } %> +
+ + <% 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 { %> +
+ +
+ + +
+
+ <% } %> +