Fix bug in poke current, fix bug in whois

This commit is contained in:
Stijn De Clercq 2020-11-22 00:30:26 +01:00
parent cd4dcbaeb5
commit 0085882148
3 changed files with 11 additions and 4 deletions

View file

@ -82,7 +82,6 @@ def diffYearBasisString(timestamp):
timestamp = epochToDate(timestamp)["dateDT"]
now = dateTimeNow()
diff = dateutil.relativedelta.relativedelta(now, timestamp)
timeList = []
# Don't add obsolete info such as "0 days", ...
@ -98,10 +97,18 @@ def diffYearBasisString(timestamp):
if diff.days != 0:
timeList.append("{} {}".format(diff.days, getPlural(diff.days, "days")))
timeString = ", ".join(timeList[:-1])
timeString = ""
if not timeList:
return "Minder dan een dag"
if len(timeList) > 1:
timeString = ", ".join(timeList[:-1])
if len(timeString) > 0:
timeString += " en "
timeString += timeList[-1]
return timeString