Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions num2words/lang_AR.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ def to_currency(self, value, currency='SR', prefix='', suffix=''):
return self.convert(value=value)

def to_ordinal(self, number, prefix=''):
self.verify_ordinal(number)
if number <= 19:
return "{}".format(self.arabicOrdinal[number])
if number < 100:
Expand Down
1 change: 1 addition & 0 deletions num2words/lang_HI.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ def _convert_to_hindi_numerals(self, value):
str(value)))

def to_ordinal_num(self, value):
self.verify_ordinal(value)
if value in self._irregular_ordinals_nums:
return self._irregular_ordinals_nums[value]

Expand Down
9 changes: 9 additions & 0 deletions tests/test_ar.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ def test_ordinal(self):
lang="ar"), 'ثلاث و عشرون')
self.assertEqual(num2words(23, lang="ar"), 'ثلاثة و عشرون')

def test_ordinal_rejects_negative(self):
# negatives used to index arabicOrdinal backwards or crash in convert
with self.assertRaises(TypeError):
num2words(-1, lang='ar', to='ordinal')
with self.assertRaises(TypeError):
num2words(-100, lang='ar', to='ordinal')
with self.assertRaises(TypeError):
num2words(-1, lang='ar', to='ordinal_num')

def test_cardinal(self):
self.assertEqual(num2words(0, to='cardinal', lang='ar'), 'صفر')
self.assertEqual(num2words(12, to='cardinal', lang='ar'), 'اثنا عشر')
Expand Down
9 changes: 9 additions & 0 deletions tests/test_hi.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,15 @@ def test_ordinal_num(self):
msg="failing number %s" % number,
)

def test_ordinal_num_rejects_negative_and_float(self):
# digit-char map; negatives/floats must raise TypeError, not KeyError
with self.assertRaises(TypeError):
num2words(-1, lang="hi", to="ordinal_num")
with self.assertRaises(TypeError):
num2words(1.5, lang="hi", to="ordinal_num")
# word ordinals still accept negatives
self.assertEqual(num2words(-1, lang="hi", to="ordinal"), "माइनस एकवाँ")

# In python3, Hindi numbers are implicitly converted into number
# as `assert int('४२') == 42`.
# Thus it's possible to pass Hindi numbers string directly
Expand Down