[Git][noosfero/noosfero][master] 2 commits: recent_activities_plugin: fix date translation
Victor Costa
gitlab at mg.gitlab.com
Thu Apr 20 10:33:13 BRT 2017
Victor Costa pushed to branch master at Noosfero / noosfero
Commits:
b73833fa by Victor Costa at 2017-04-20T08:55:08-03:00
recent_activities_plugin: fix date translation
- - - - -
e756d2eb by Victor Costa at 2017-04-20T13:32:53+00:00
Merge branch 'fix-recent-activities-plugin' into 'master'
recent_activities_plugin: fix date translation
See merge request !1181
- - - - -
1 changed file:
- plugins/recent_activities/views/blocks/activities.html.erb
Changes:
=====================================
plugins/recent_activities/views/blocks/activities.html.erb
=====================================
--- a/plugins/recent_activities/views/blocks/activities.html.erb
+++ b/plugins/recent_activities/views/blocks/activities.html.erb
@@ -10,7 +10,7 @@
<%=
_('Event on <b>%s</b> at %s - %s').html_safe %
[
- l(activity.target.start_date, format: :medium),
+ time_ago_in_words(activity.target.start_date),
activity.target.start_date.strftime("%H:%M"),
link_to(activity.user.name, activity.user.url)
]
@@ -19,7 +19,7 @@
<%=
_('On <b>%s</b> at %s - %s').html_safe %
[
- l(activity.created_at, format: :medium),
+ time_ago_in_words(activity.created_at),
activity.created_at.strftime("%H:%M"),
link_to(activity.user.name, activity.user.url)
]
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/52e7089fa8d47ecdddb9775fafaf891ebd629b15...e756d2eb31bf90a7a7f0df7e40599dc2dc93abdf
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/52e7089fa8d47ecdddb9775fafaf891ebd629b15...e756d2eb31bf90a7a7f0df7e40599dc2dc93abdf
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170420/689f18e6/attachment-0001.html>
More information about the Noosfero-dev
mailing list