Skip to content

fix: naturaldelta includes months when years > 1 and months=True #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amitmishra11 wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −16
Open

fix: naturaldelta includes months when years > 1 and months=True #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c5389f
fix: naturaldelta shows months when years > 1 and months=True
Jul 11, 2026
98b061a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/humanize/time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,17 @@ def naturaldelta(

return _ngettext("1 year, %d day", "1 year, %d days", days) % days

if use_months and 0 < num_months < 12:
years_str = _ngettext("%d year", "%d years", years).replace(
"%d", "%s"
) % intcomma(years)
months_str = _ngettext("%d month", "%d months", num_months) % num_months
return f"{years_str}, {months_str}"
if use_months and num_months == 12:
years += 1
return _ngettext("%d year", "%d years", years).replace("%d", "%s") % intcomma(
years
)
return _ngettext("%d year", "%d years", years).replace("%d", "%s") % intcomma(years)


Expand Down
32 changes: 16 additions & 16 deletions tests/test_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ def test_naturaldelta_nomonths(test_input: dt.timedelta, expected: str) -> None:
(dt.timedelta(hours=23, minutes=50, seconds=50), "a day"),
(dt.timedelta(days=1), "a day"),
(dt.timedelta(days=500), "1 year, 4 months"),
(dt.timedelta(days=365 * 2 + 35), "2 years"),
(dt.timedelta(days=365 * 2 + 35), "2 years, 1 month"),
(dt.timedelta(seconds=1), "a second"),
(dt.timedelta(seconds=30), "30 seconds"),
(dt.timedelta(days=364), "a year"),
(dt.timedelta(days=365 + 364), "2 years"),
# regression tests for bugs in post-release humanize
(dt.timedelta(days=10000), "27 years"),
(dt.timedelta(days=10000), "27 years, 5 months"),
(dt.timedelta(days=365 + 35), "1 year, 1 month"),
(dt.timedelta(days=365 * 2 + 65), "2 years"),
(dt.timedelta(days=365 * 2 + 65), "2 years, 2 months"),
(dt.timedelta(days=365 + 4), "1 year, 4 days"),
(dt.timedelta(days=35), "a month"),
(dt.timedelta(days=65), "2 months"),
Expand Down Expand Up @@ -154,7 +154,7 @@ def test_naturaldelta(test_input: float | dt.timedelta, expected: str) -> None:
(NOW - dt.timedelta(hours=23, minutes=50, seconds=50), "a day ago"),
(NOW - dt.timedelta(days=1), "a day ago"),
(NOW - dt.timedelta(days=500), "1 year, 4 months ago"),
(NOW - dt.timedelta(days=365 * 2 + 35), "2 years ago"),
(NOW - dt.timedelta(days=365 * 2 + 35), "2 years, 1 month ago"),
(NOW + dt.timedelta(seconds=1), "a second from now"),
(NOW + dt.timedelta(seconds=30), "30 seconds from now"),
(NOW + dt.timedelta(minutes=1, seconds=29), "a minute from now"),
Expand All @@ -166,17 +166,17 @@ def test_naturaldelta(test_input: float | dt.timedelta, expected: str) -> None:
(NOW + dt.timedelta(hours=23, minutes=50, seconds=50), "a day from now"),
(NOW + dt.timedelta(days=1), "a day from now"),
(NOW + dt.timedelta(days=500), "1 year, 4 months from now"),
(NOW + dt.timedelta(days=365 * 2 + 35), "2 years from now"),
(NOW + dt.timedelta(days=365 * 2 + 35), "2 years, 1 month from now"),
# regression tests for bugs in post-release humanize
(NOW + dt.timedelta(days=10000), "27 years from now"),
(NOW + dt.timedelta(days=10000), "27 years, 5 months from now"),
(NOW - dt.timedelta(days=365 + 35), "1 year, 1 month ago"),
(dt.timedelta(days=-10000), "27 years from now"),
(dt.timedelta(days=-10000), "27 years, 5 months from now"),
(dt.timedelta(days=365 + 35), "1 year, 1 month ago"),
(22.5, "22 seconds ago"),
(23.5, "24 seconds ago"),
(23.9, "24 seconds ago"),
(30, "30 seconds ago"),
(NOW - dt.timedelta(days=365 * 2 + 65), "2 years ago"),
(NOW - dt.timedelta(days=365 * 2 + 65), "2 years, 2 months ago"),
(NOW - dt.timedelta(days=365 + 4), "1 year, 4 days ago"),
("NaN", "NaN"),
],
Expand Down Expand Up @@ -479,7 +479,7 @@ def test_naturaltime_minimum_unit_explicit(
(NOW_UTC - dt.timedelta(hours=23, minutes=50, seconds=50), "a day ago"),
(NOW_UTC - dt.timedelta(days=1), "a day ago"),
(NOW_UTC - dt.timedelta(days=500), "1 year, 4 months ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 35), "2 years ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 35), "2 years, 1 month ago"),
(NOW_UTC + dt.timedelta(seconds=1), "a second from now"),
(NOW_UTC + dt.timedelta(seconds=30), "30 seconds from now"),
(NOW_UTC + dt.timedelta(minutes=1, seconds=29), "a minute from now"),
Expand All @@ -491,11 +491,11 @@ def test_naturaltime_minimum_unit_explicit(
(NOW_UTC + dt.timedelta(hours=23, minutes=50, seconds=50), "a day from now"),
(NOW_UTC + dt.timedelta(days=1), "a day from now"),
(NOW_UTC + dt.timedelta(days=500), "1 year, 4 months from now"),
(NOW_UTC + dt.timedelta(days=365 * 2 + 35), "2 years from now"),
(NOW_UTC + dt.timedelta(days=365 * 2 + 35), "2 years, 1 month from now"),
# regression tests for bugs in post-release humanize
(NOW_UTC + dt.timedelta(days=10000), "27 years from now"),
(NOW_UTC + dt.timedelta(days=10000), "27 years, 5 months from now"),
(NOW_UTC - dt.timedelta(days=365 + 35), "1 year, 1 month ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 65), "2 years ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 65), "2 years, 2 months ago"),
(NOW_UTC - dt.timedelta(days=365 + 4), "1 year, 4 days ago"),
],
)
Expand All @@ -519,7 +519,7 @@ def test_naturaltime_timezone(test_input: dt.datetime, expected: str) -> None:
(NOW_UTC - dt.timedelta(hours=23, minutes=50, seconds=50), "a day ago"),
(NOW_UTC - dt.timedelta(days=1), "a day ago"),
(NOW_UTC - dt.timedelta(days=500), "1 year, 4 months ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 35), "2 years ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 35), "2 years, 1 month ago"),
(NOW_UTC + dt.timedelta(seconds=1), "a second from now"),
(NOW_UTC + dt.timedelta(seconds=30), "30 seconds from now"),
(NOW_UTC + dt.timedelta(minutes=1, seconds=29), "a minute from now"),
Expand All @@ -531,11 +531,11 @@ def test_naturaltime_timezone(test_input: dt.datetime, expected: str) -> None:
(NOW_UTC + dt.timedelta(hours=23, minutes=50, seconds=50), "a day from now"),
(NOW_UTC + dt.timedelta(days=1), "a day from now"),
(NOW_UTC + dt.timedelta(days=500), "1 year, 4 months from now"),
(NOW_UTC + dt.timedelta(days=365 * 2 + 35), "2 years from now"),
(NOW_UTC + dt.timedelta(days=365 * 2 + 35), "2 years, 1 month from now"),
# regression tests for bugs in post-release humanize
(NOW_UTC + dt.timedelta(days=10000), "27 years from now"),
(NOW_UTC + dt.timedelta(days=10000), "27 years, 5 months from now"),
(NOW_UTC - dt.timedelta(days=365 + 35), "1 year, 1 month ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 65), "2 years ago"),
(NOW_UTC - dt.timedelta(days=365 * 2 + 65), "2 years, 2 months ago"),
(NOW_UTC - dt.timedelta(days=365 + 4), "1 year, 4 days ago"),
],
)
Expand Down
Loading