mirror of
https://github.com/stijndcl/didier.git
synced 2026-04-07 15:48:29 +02:00
Fix bug in poke current, fix bug in whois
This commit is contained in:
parent
cd4dcbaeb5
commit
0085882148
3 changed files with 11 additions and 4 deletions
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue