Skip to content
Browse files

Improve comment descriptions in note popups

  • Loading branch information...
1 parent 56db9ca commit db5c58ed09ed7f767a340ef889a29b6282505b82 @tomhughes committed
Showing with 12 additions and 7 deletions.
  1. +4 −5 app/assets/javascripts/templates/notes/show.jst.ejs
  2. +8 −2 config/locales/en.yml
View
9 app/assets/javascripts/templates/notes/show.jst.ejs
@@ -4,13 +4,12 @@
<div>
<small class="deemphasize">
<% if (comment.user) { %>
- <%= I18n.t('javascripts.notes.show.event', {
- action: comment.action, user: comment.user,
- user_url: comment.user_url, 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
}) %>
<% } %>
</small>
View
10 config/locales/en.yml
@@ -2021,8 +2021,14 @@ en:
add: Add Note
show:
title: Note %{id}
- event: "%{action} by <a href='%{user_url}'>%{user}</a> at %{time}"
- anonymous_event: "%{action} by anonymous at %{time}"
+ opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
+ opened_by_anonymous: "created by anonymous at %{time}"
+ commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
+ commented_by_anonymous: "comment from anonymous at %{time}"
+ closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
+ closeded_by_anonymous: "resolved by anonymous at %{time}"
+ reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
+ reopened_by_anonymous: "reactivated by anonymous at %{time}"
close: Close
comment_and_close: Comment & Close
comment: Comment

0 comments on commit db5c58e

Please sign in to comment.
Something went wrong with that request. Please try again.