Localise dates and times in notes popups

diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index 6d3a9b3bfccd59271f4ee4ee8a6f9674779841b1..abcecc66cbd627ebc1437c46a0718e0decbdb288 100644 (file)
--- 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
index 982d60da74b5a24326adceb1c1c3f1e346f3e139..4882a4357c4a7f56cb38983e5b34581d3fff2ca3 100644 (file)
--- 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
index b40a639d8ce2af76dca139b5898a3a1f7f90bf70..8d45dfe2622a1741721c23cbea4e343d64b3ba87 100644 (file)
--- 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