Skip to content

Fix ordinal() suffix for negative integers #321

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
fbindakheel wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −1
Open

Fix ordinal() suffix for negative integers #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/humanize/number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ def ordinal(value: NumberOrString, gender: str = "male") -> str:
except (TypeError, ValueError):
return str(value)
gender = "male" if gender == "male" else "female"
digit = 0 if value % 100 in (11, 12, 13) else value % 10
# Use the magnitude for suffix selection: Python's modulo on negative
# numbers is non-negative (e.g. -1 % 10 == 9), which would otherwise
# pick the wrong suffix and produce "-1th" instead of "-1st".
abs_value = abs(value)
digit = 0 if abs_value % 100 in (11, 12, 13) else abs_value % 10
return f"{value}{P_(f'{digit} ({gender})', _ORDINAL_SUFFIXES[digit])}"


Expand Down
10 changes: 10 additions & 0 deletions tests/test_number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
("102", "102nd"),
("103", "103rd"),
("111", "111th"),
("-1", "-1st"),
("-2", "-2nd"),
("-3", "-3rd"),
("-4", "-4th"),
("-11", "-11th"),
("-12", "-12th"),
("-13", "-13th"),
("-21", "-21st"),
("-101", "-101st"),
("-111", "-111th"),
("something else", "something else"),
(None, "None"),
(math.nan, "NaN"),
Expand Down