Localise dates and times in notes popups

This commit is contained in:
Tom Hughes 2013-02-02 12:11:46 +00:00
parent db5c58ed09
commit e957aaacb6
3 changed files with 6 additions and 3 deletions

View file

@ -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 file

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

View file

@ -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