[#3012] Make time_ago i18n friendly

ckan · Nov 12, 2012 · e990585 · e990585
1 parent 0558ce7
commit e990585
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -21,7 +21,6 @@
 from webhelpers.markdown import markdown
 from webhelpers import paginate
 from webhelpers.text import truncate
-import webhelpers.date as date
 from pylons import url as _pylons_default_url
 from pylons.decorators.cache import beaker_cache
 from pylons import config
@@ -812,8 +811,7 @@ def tzname(self, dt):
 
 def time_ago_in_words_from_str(date_str, granularity='month'):
     if date_str:
-        return date.time_ago_in_words(date_str_to_datetime(date_str),
-                                      granularity=granularity)
+        return formatters.localised_nice_date(date_str_to_datetime(date_str))
     else:
         return _('Unknown')
 

diff --git a/ckan/templates/snippets/activity_item.html b/ckan/templates/snippets/activity_item.html
@@ -2,6 +2,6 @@
 	<i class="icon-{{ activity.icon }}"></i>
 	<p>
 		{{ h.literal(activity.msg.format(**activity.data)) }}
-		<span class="date">{{ h.time_ago_in_words_from_str(activity.timestamp, 'hour') }} ago</span>
+		<span class="date">{{ h.time_ago_in_words_from_str(activity.timestamp, 'hour') }}</span>
 	</p>
-</li>
+</li>