diff options
| author | nessita <124304+nessita@users.noreply.github.com> | 2023-04-13 13:16:33 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 13:16:33 -0300 |
| commit | 813015d67e2557fa859a07930a9becec4e5f64a0 (patch) | |
| tree | a4f970c99ddf26a631cbd72c5a55857d97e1d256 /django | |
| parent | 09767420879b7542e48589e9003966ed31279e7b (diff) | |
| download | django-813015d67e2557fa859a07930a9becec4e5f64a0.tar.gz | |
Fixed #34483 -- Fixed timesince()/timeuntil() with timezone-aware dates and interval less than 1 day.
Regression in 8d67e16493c903adc9d049141028bc0fff43f8c8.
Thanks Lorenzo Peña for the report.
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/timesince.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/utils/timesince.py b/django/utils/timesince.py index 7a79e55ad9..94ba24d48a 100644 --- a/django/utils/timesince.py +++ b/django/utils/timesince.py @@ -77,7 +77,8 @@ def timesince(d, now=None, reversed=False, time_strings=None, depth=2): # Get years and months. total_months = (now.year - d.year) * 12 + (now.month - d.month) - if d.day > now.day or (d.day == now.day and d.time() > now.time()): + time_delta = delta - datetime.timedelta(days=delta.days) + if d.day > now.day or (d.day == now.day and time_delta.total_seconds() < 0): total_months -= 1 years, months = divmod(total_months, 12) |