Localise dates and times in notes popups

tomhughes · Feb 2, 2013 · e957aaa · e957aaa
1 parent db5c58e
commit e957aaa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -5,11 +5,12 @@
     <small class="deemphasize">
       <% if (comment.user) { %>
         <%= I18n.t('javascripts.notes.show.' + comment.action + '_by', {
-           user: comment.user, user_url: comment.user_url, time: comment.date
+           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: comment.date
+           time: I18n.l("time.formats.long", comment.date)
         }) %>
       <% } %>
     </small>

diff --git a/config/i18n-js.yml b/config/i18n-js.yml
@@ -23,6 +23,8 @@
 translations:
   - file: "app/assets/javascripts/i18n/translations.js"
     only:
+    - "*.date"
+    - "*.time"
     - "*.browse.start_rjs.*"
     - "*.export.start_rjs.*"
     - "*.javascripts.*"

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2026,7 +2026,7 @@ en:
         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}"
+        closed_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