diff options
| author | nessita <124304+nessita@users.noreply.github.com> | 2023-04-13 13:16:33 -0300 |
|---|---|---|
| committer | Natalia <124304+nessita@users.noreply.github.com> | 2023-04-13 13:20:16 -0300 |
| commit | a3c14ea61b7b0e91ff646dfe75850d918ef7e478 (patch) | |
| tree | cbc98f5c0bc7f24a58bbfa0e4b9dba63d249b67f /django | |
| parent | 791407fef16faa4da6fe2247c24a9055037dd5dd (diff) | |
[4.2.x] 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.
Backport of 813015d67e2557fa859a07930a9becec4e5f64a0 from main
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) |