bblaz/num2words
1
0
Fork 0
mirror of https://github.com/bblaz/num2words.git synced 2025-12-06 06:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional test case

Browse Source
This commit is contained in:
Eyosiyas Bereketab
2022-08-10 09:34:03 +03:00
committed by Willem Van Onsem
parent a7442708fa
commit 2ca98971e1
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
num2words/lang_AM.py
View File

@@ -60,7 +60,7 @@ class Num2Word_AM(lang_EU.Num2Word_EU):
'ስምንት': 'ስምንተኛ', 'ስምንት': 'ስምንተኛ',
'ዘጠኝ': 'ዘጠነኛ', 'ዘጠኝ': 'ዘጠነኛ',
'አሥር': 'አሥረኛ', 'አሥር': 'አሥረኛ',
'አሥራ አንድ': 'አሥራ አንድ', 'አሥራ አንድ': 'አሥራ አንደኛ',
'አሥራ ሁለት': 'አሥራ ሁለተኛ', 'አሥራ ሁለት': 'አሥራ ሁለተኛ',
'አሥራ ሦስት': 'አሥራ ሦስተኛ', 'አሥራ ሦስት': 'አሥራ ሦስተኛ',
'አሥራ አራት': 'አሥራ አራተኛ', 'አሥራ አራት': 'አሥራ አራተኛ',
@@ -77,10 +77,6 @@ class Num2Word_AM(lang_EU.Num2Word_EU):
return self.to_cardinal_float(value) return self.to_cardinal_float(value)
out = '' out = ''
if value < 0:
value = abs(value)
out = self.negword
if value >= self.MAXVAL: if value >= self.MAXVAL:
raise OverflowError(self.errmsg_toobig % (value, self.MAXVAL)) raise OverflowError(self.errmsg_toobig % (value, self.MAXVAL))
@@ -95,14 +91,13 @@ class Num2Word_AM(lang_EU.Num2Word_EU):
ltext, lnum = lpair ltext, lnum = lpair
rtext, rnum = rpair rtext, rnum = rpair
if lnum == 1 and rnum < 100: if lnum == 1 and rnum < 100:
return (rtext, rnum) return rtext, rnum
elif 100 > lnum > rnum: elif 100 > lnum > rnum:
return ('%s %s' % (ltext, rtext), lnum + rnum) return '%s %s' % (ltext, rtext), lnum + rnum
elif lnum >= 100 > rnum: elif lnum >= 100 > rnum:
return ('%s %s' % (ltext, rtext), lnum + rnum) return '%s %s' % (ltext, rtext), lnum + rnum
elif rnum > lnum: elif rnum > lnum:
return ('%s %s' % (ltext, rtext), lnum * rnum) return '%s %s' % (ltext, rtext), lnum * rnum
return ('%s, %s' % (ltext, rtext), lnum + rnum)
def to_ordinal(self, value): def to_ordinal(self, value):
self.verify_ordinal(value) self.verify_ordinal(value)
@@ -112,9 +107,7 @@ class Num2Word_AM(lang_EU.Num2Word_EU):
try: try:
lastword = self.ords[lastword] lastword = self.ords[lastword]
except KeyError: except KeyError:
if lastword[-1] == 'y': lastword += 'ኛ'
lastword = lastword[:-1] + 'ie'
lastword += 'th'
lastwords[-1] = self.title(lastword) lastwords[-1] = self.title(lastword)
outwords[-1] = ' '.join(lastwords) outwords[-1] = ' '.join(lastwords)
return ' '.join(outwords) return ' '.join(outwords)

4
tests/test_am.py
View File

@@ -42,6 +42,10 @@ class Num2WordsAMTest(TestCase):
num2words(22, lang='am', to='ordinal'), num2words(22, lang='am', to='ordinal'),
'ሃያ ሁለተኛ' 'ሃያ ሁለተኛ'
) )
self.assertEqual(
num2words(10000, lang='am', to='ordinal'),
'አሥር ሺህኛ'
)
def test_to_ordinal_num(self): def test_to_ordinal_num(self):
self.assertEqual(num2words(10, lang='am', to='ordinal_num'), '10ኛ') self.assertEqual(num2words(10, lang='am', to='ordinal_num'), '10ኛ')