From f34ea10b66c0422b421c59a9f2aa199e99db3fd4 Mon Sep 17 00:00:00 2001
From: root <root@mnemo.proventa-ag.biz>
Date: Thu, 26 Mar 2015 12:31:28 +0100
Subject: [PATCH 1/2] implement the <time> html5 tag for all times.

---
 seahub/base/templatetags/seahub_tags.py | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/seahub/base/templatetags/seahub_tags.py b/seahub/base/templatetags/seahub_tags.py
index 2b51f4f178..9bc3a896b1 100644
--- a/seahub/base/templatetags/seahub_tags.py
+++ b/seahub/base/templatetags/seahub_tags.py
@@ -242,31 +242,37 @@ def translate_commit_desc_escape(value):
     return return_value
 
 @register.filter(name='translate_seahub_time')
-def translate_seahub_time(value):
-    """Translate seahub time to human friendly format instead of timestamp"""
-    
+def translate_seahub_time(value, autoescape=None):
     if isinstance(value, int) or isinstance(value, long): # check whether value is int
-        val_ts = value
         try:
-            val = datetime.fromtimestamp(val_ts) # convert timestamp to datetime
+            val = datetime.fromtimestamp(value) # convert timestamp to datetime
         except ValueError as e:
             return ""
     elif isinstance(value, datetime):
         # FIXME: convert datetime to timestamp may cause problem, need a better way.
-        val_ts = int(time.mktime(value.timetuple())) 
         val = value
     else:
         return value
 
-    limit = 14 * 24 * 60 * 60	# Timestamp with in two weeks will be translated
+    translated_time=translate_seahub_time_str(val);
+    if autoescape:
+       translated_time = escape(translated_time)
+
+    timestring=val.isoformat()
+    titletime=val.strftime("%c")
+ 
+    time_with_tag='<time datetime="'+timestring+'" is="relative-time" title="'+titletime+'" >'+translated_time+'</time>'
+
+    return mark_safe(time_with_tag)
+
+def translate_seahub_time_str(val):
+    """Translate seahub time to human friendly format instead of timestamp"""
+    
     now = datetime.now()
-    # If current time is less than value, that means clock at user machine is
-    # faster than server, in this case, we just set time description to `just now`
-    if time.mktime(now.timetuple()) < val_ts:
-        return _('Just now')
+    limit = 14 * 24 * 60 * 60	# Timestamp with in two weeks will be translated
 
     delta = now - (val - dt.timedelta(0, 0, val.microsecond))
-    seconds = delta.seconds
+    seconds = delta.total_seconds()
     days = delta.days
     if days * 24 * 60 * 60 + seconds > limit:
         return val.strftime("%Y-%m-%d")

From 5746ef946522f990a5f5f62da5a21524613a5411 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Mon, 30 Mar 2015 15:29:29 +0800
Subject: [PATCH 2/2] Refactor code

---
 seahub/base/templatetags/seahub_tags.py | 26 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/seahub/base/templatetags/seahub_tags.py b/seahub/base/templatetags/seahub_tags.py
index 9bc3a896b1..2c968c0466 100644
--- a/seahub/base/templatetags/seahub_tags.py
+++ b/seahub/base/templatetags/seahub_tags.py
@@ -249,30 +249,34 @@ def translate_seahub_time(value, autoescape=None):
         except ValueError as e:
             return ""
     elif isinstance(value, datetime):
-        # FIXME: convert datetime to timestamp may cause problem, need a better way.
         val = value
     else:
         return value
 
-    translated_time=translate_seahub_time_str(val);
+    translated_time = translate_seahub_time_str(val)
     if autoescape:
-       translated_time = escape(translated_time)
+        translated_time = escape(translated_time)
 
-    timestring=val.isoformat()
-    titletime=val.strftime("%c")
- 
-    time_with_tag='<time datetime="'+timestring+'" is="relative-time" title="'+titletime+'" >'+translated_time+'</time>'
+    timestring = val.isoformat()
+    titletime = val.strftime("%c")
+
+    time_with_tag = '<time datetime="'+timestring+'" is="relative-time" title="'+titletime+'" >'+translated_time+'</time>'
 
     return mark_safe(time_with_tag)
 
 def translate_seahub_time_str(val):
-    """Translate seahub time to human friendly format instead of timestamp"""
-    
+    """Convert python datetime to human friendly format."""
+
     now = datetime.now()
-    limit = 14 * 24 * 60 * 60	# Timestamp with in two weeks will be translated
+    # If current time is less than `val`, that means clock at user machine is
+    # faster than server, in this case, we just set time description to `just now`
+    if now < val:
+        return _('Just now')
+
+    limit = 14 * 24 * 60 * 60  # Timestamp with in two weeks will be translated
 
     delta = now - (val - dt.timedelta(0, 0, val.microsecond))
-    seconds = delta.total_seconds()
+    seconds = delta.seconds
     days = delta.days
     if days * 24 * 60 * 60 + seconds > limit:
         return val.strftime("%Y-%m-%d")