Improve comment descriptions in note popups
authorTom Hughes <tom@compton.nu>
Sat, 2 Feb 2013 11:22:11 +0000 (11:22 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 2 Feb 2013 11:40:28 +0000 (11:40 +0000)
app/assets/javascripts/templates/notes/show.jst.ejs
config/locales/en.yml

index 9b9266a05a6694fd25809a619cd8c829c7de263e..6d3a9b3bfccd59271f4ee4ee8a6f9674779841b1 100644 (file)
@@ -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>
index cfe0703e9b618079e7fc5187f43f24b4fde32d99..b40a639d8ce2af76dca139b5898a3a1f7f90bf70 100644 (file)
@@ -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