Skip to content
Browse files

Localise dates and times in notes popups

  • Loading branch information...
1 parent db5c58e commit e957aaacb622648a890657ed0880366c1f207699 @tomhughes committed Feb 2, 2013
Showing with 6 additions and 3 deletions.
  1. +3 −2 app/assets/javascripts/templates/notes/show.jst.ejs
  2. +2 −0 config/i18n-js.yml
  3. +1 −1 config/locales/en.yml
View
5 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>
View
2 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.*"
View
2 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

0 comments on commit e957aaa

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