Localizing the diff_date filter in extra_tags.py

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@648 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 3e0cf4c9f0d3f5c238cd1a942ef167930da4ce04..deb0567ea4db0a4716e38cf1936bc662423d7716 100644 (file)
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -100,7 +100,7 @@ def diff_date(date, limen=2):
 
     if days > 2:
         if date.year == now.year:
-            return date.strftime("%b %d at %H:%M")
+            return date.strftime("%s %s %s %s" % (_("%b"), _("%d"), _("at"), "%H:%M"))
         else:
             return date.strftime("%b %d '%y at %H:%M")
     elif days == 2:
@@ -108,11 +108,11 @@ def diff_date(date, limen=2):
     elif days == 1:
         return _('yesterday')
     elif minutes >= 60:
-        return ungettext('%(hr)d hour ago', '%(hr)d hours ago', hours) % {'hr':hours}
+        return ungettext('%(hr)d ' + _("hour ago"), '%(hr)d ' + _("hours ago"), hours) % {'hr':hours}
     elif diff.seconds >= 60:
-        return ungettext('%(min)d min ago', '%(min)d mins ago', minutes) % {'min':minutes}
+        return ungettext('%(min)d ' + _("min ago"), '%(min)d ' + _("mins ago"), minutes) % {'min':minutes}
     else:
-        return ungettext('%(sec)d sec ago', '%(sec)d secs ago', diff.seconds) % {'sec':diff.seconds}
+        return ungettext('%(sec)d ' + _("sec ago"), '%(sec)d ' + _("secs ago"), diff.seconds) % {'sec':diff.seconds}
 
 @register.simple_tag
 def media(url):