File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -299,8 +299,10 @@ def readable_datetime(datetime_str):
299299 dt = parser .parse (datetime_str ).astimezone (timezone )
300300 now = datetime .now (timezone )
301301 delta = relativedelta .relativedelta (now , dt )
302+ yesterday = now - relativedelta .relativedelta (days = 1 )
303+
302304 # if it happened today, say "2 hours and 1 minute ago"
303- if delta . days <= 1 and dt . day == now . day :
305+ if dt > yesterday :
304306 if delta .hours == 0 :
305307 hour_str = ''
306308 elif delta .hours == 1 :
@@ -317,13 +319,13 @@ def readable_datetime(datetime_str):
317319 return 'Just now'
318320 else :
319321 return "{}{}ago" .format (hour_str , min_str )
322+
320323 # if it happened yesterday, say "yesterday at 3:23 pm"
321- yesterday = now + relativedelta .relativedelta (days = - 1 )
322- if delta .days <= 2 and dt .day == yesterday .day :
324+ elif yesterday .year == dt .year and yesterday .month == dt .month and yesterday .day == dt .day :
323325 return dt .strftime ("Yesterday at %X" )
326+
324327 # otherwise return locale-specific date/time format
325- else :
326- return dt .strftime ('%c %Z' )
328+ return dt .strftime ('%c %Z' )
327329
328330
329331def trim (docstring ):
You can’t perform that action at this time.
0 commit comments