From db5c58ed09ed7f767a340ef889a29b6282505b82 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 2 Feb 2013 11:22:11 +0000
Subject: [PATCH] Improve comment descriptions in note popups

---
 app/assets/javascripts/templates/notes/show.jst.ejs |  9 ++++-----
 config/locales/en.yml                               | 10 ++++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index 9b9266a05..6d3a9b3bf 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cfe0703e9..b40a639d8 100644
--- a/config/locales/en.yml
+++ b/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
-- 
2.43.2