summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--searx/webapp.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index d06c58f32..a4c05a9e9 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -159,8 +159,8 @@ def index():
# TODO, check if timezone is calculated right
if 'publishedDate' in result:
- if result['publishedDate'] >= datetime.now() - timedelta(days=1):
- timedifference = datetime.now() - result['publishedDate']
+ if result['publishedDate'].replace(tzinfo=None) >= datetime.now() - timedelta(days=1):
+ timedifference = datetime.now() - result['publishedDate'].replace(tzinfo=None)
minutes = int((timedifference.seconds / 60) % 60)
hours = int(timedifference.seconds / 60 / 60)
if hours == 0:
@@ -168,8 +168,7 @@ def index():
else:
result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes) # noqa
else:
- # TODO using right timezone
- result['pubdate'] = result['publishedDate'].strftime('%a, %d %b %Y %H:%M:%S +0000')
+ result['pubdate'] = result['publishedDate'].strftime('%a, %d %b %Y %H:%M:%S %z')
result['publishedDate'] = format_date(result['publishedDate'])
if search.request_data.get('format') == 'json':