Skip to content

fix: ordinal_num returns '1.0st' for float 1.0 instead of '1st' #666

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
gaoflow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ordinal_num returns '1.0st' for float 1.0 instead of '1st' #666

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: 6 additions & 0 deletions num2words/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,10 @@ def num2words(number, ordinal=False, lang='en', to='cardinal', **kwargs):
if to not in CONVERTES_TYPES:
raise NotImplementedError()

# Float values equal to an integer (e.g. 1.0, 2.0) are valid ordinals;
# convert them to int so to_ordinal_num doesn't embed the decimal point
# in the formatted result (e.g. "1.0st" instead of the correct "1st").
if to in ('ordinal', 'ordinal_num') and isinstance(number, float) and number == int(number):
number = int(number)

return getattr(converter, 'to_{}'.format(to))(number, **kwargs)
4 changes: 4 additions & 0 deletions tests/test_en.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ def test_ordinal_num(self):
self.assertEqual(num2words(21, lang='en', to='ordinal_num'), '21st')
self.assertEqual(num2words(102, lang='en', to='ordinal_num'), '102nd')
self.assertEqual(num2words(73, lang='en', to='ordinal_num'), '73rd')
# integer-valued floats should format without the decimal point
self.assertEqual(num2words(1.0, lang='en', to='ordinal_num'), '1st')
self.assertEqual(num2words(2.0, lang='en', to='ordinal_num'), '2nd')
self.assertEqual(num2words(21.0, lang='en', to='ordinal_num'), '21st')

def test_cardinal_for_float_number(self):
self.assertEqual(num2words(0.12), "zero point one two")
Expand Down