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
2 changes: 2 additions & 0 deletions num2words/lang_AM.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ def merge(self, lpair, rpair):
return '%s %s' % (ltext, rtext), lnum + rnum
elif rnum > lnum:
return '%s %s' % (ltext, rtext), lnum * rnum
# Default case: safely add if nothing else matches
return '%s %s' % (ltext, rtext), lnum + rnum

def to_ordinal(self, value):
self.verify_ordinal(value)
Expand Down
15 changes: 9 additions & 6 deletions num2words/lang_IT.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,16 @@ def to_currency(self, val, currency='EUR', cents=True, separator=' e',


def phonetic_contraction(string):
# Skip contraction if string contains "diciotto" to avoid breaking it
if "diciotto" in string:
return string

return (string
.replace("oo", "o") # ex. "centootto"
.replace("ao", "o") # ex. "settantaotto"
.replace("io", "o") # ex. "ventiotto"
.replace("au", "u") # ex. "trentauno"
.replace("iu", "u") # ex. "ventiunesimo"
)
.replace("oo", "o") # centootto → centotto
.replace("ao", "o") # settantaotto → settantotto
.replace("io", "o") # ventiotto → ventotto
.replace("au", "u") # trentauno → trentuno
.replace("iu", "u")) # ventiuno → ventuno


def exponent_length_to_string(exponent_length):
Expand Down
14 changes: 14 additions & 0 deletions tests/test_am.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,17 @@ def test_to_year(self):
'አንድ ሺህ ስድሳ ስድስት')
self.assertEqual(num2words(1865, lang='am', to='year'),
'አሥራ ስምንት መቶ ስድሳ አምስት')

def test_cardinal_trigger_merge_success(self):
try:
num2words(1210, lang='am')
except Exception as e:
self.fail(f"num2words(1210, lang='am') raised an unexpected exception: {e}")

def test_cardinal_large_numbers_success(self):
try:
num2words(1000000, lang='am')
num2words(1000000000, lang='am')
except Exception as e:
self.fail(f"num2words(large number, lang='am') raised an unexpected exception: {e}")

36 changes: 36 additions & 0 deletions tests/test_it.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,49 @@ def test_0(self):
def test_1_to_10(self):
self.assertEqual(num2words(1, lang="it"), "uno")
self.assertEqual(num2words(2, lang="it"), "due")
self.assertEqual(num2words(3, lang="it"), "tre")
self.assertEqual(num2words(4, lang="it"), "quattro")
self.assertEqual(num2words(5, lang="it"), "cinque")
self.assertEqual(num2words(6, lang="it"), "sei")
self.assertEqual(num2words(7, lang="it"), "sette")
self.assertEqual(num2words(8, lang="it"), "otto")
self.assertEqual(num2words(9, lang="it"), "nove")
self.assertEqual(num2words(10, lang="it"), "dieci")

def test_11_to_19(self):
self.assertEqual(num2words(11, lang="it"), "undici")
self.assertEqual(num2words(12, lang="it"), "dodici")
self.assertEqual(num2words(13, lang="it"), "tredici")
self.assertEqual(num2words(14, lang="it"), "quattordici")
self.assertEqual(num2words(15, lang="it"), "quindici")
self.assertEqual(num2words(16, lang="it"), "sedici")
self.assertEqual(num2words(17, lang="it"), "diciassette")
self.assertEqual(num2words(18, lang="it"), "diciotto")
self.assertEqual(num2words(19, lang="it"), "diciannove")

def test_20_to_99(self):
self.assertEqual(num2words(20, lang="it"), "venti")
self.assertEqual(num2words(21, lang="it"), "ventuno")
self.assertEqual(num2words(22, lang="it"), "ventidue")
self.assertEqual(num2words(23, lang="it"), "ventitré")
self.assertEqual(num2words(24, lang="it"), "ventiquattro")
self.assertEqual(num2words(25, lang="it"), "venticinque")
self.assertEqual(num2words(26, lang="it"), "ventisei")
self.assertEqual(num2words(27, lang="it"), "ventisette")
self.assertEqual(num2words(28, lang="it"), "ventotto")
self.assertEqual(num2words(29, lang="it"), "ventinove")
self.assertEqual(num2words(30, lang="it"), "trenta")
self.assertEqual(num2words(31, lang="it"), "trentuno")
self.assertEqual(num2words(32, lang="it"), "trentadue")
self.assertEqual(num2words(33, lang="it"), "trentatré")
self.assertEqual(num2words(40, lang="it"), "quaranta")
self.assertEqual(num2words(50, lang="it"), "cinquanta")
self.assertEqual(num2words(66, lang="it"), "sessantasei")
self.assertEqual(num2words(70, lang="it"), "settanta")
self.assertEqual(num2words(81, lang="it"), "ottantuno")
self.assertEqual(num2words(88, lang="it"), "ottantotto")
self.assertEqual(num2words(92, lang="it"), "novantadue")
self.assertEqual(num2words(99, lang="it"), "novantanove")

def test_100_to_999(self):
self.assertEqual(num2words(100, lang="it"), "cento")
Expand Down Expand Up @@ -152,6 +176,18 @@ def test_1000_to_9999(self):
"cinquecentoventitremilaquattrocentocinquantasei"
)

def test_ending_in_18(self):
self.assertEqual(num2words(118, lang="it"), "centodiciotto")
self.assertEqual(num2words(218, lang="it"), "duecentodiciotto")
self.assertEqual(num2words(318, lang="it"), "trecentodiciotto")
self.assertEqual(num2words(418, lang="it"), "quattrocentodiciotto")
self.assertEqual(num2words(518, lang="it"), "cinquecentodiciotto")
self.assertEqual(num2words(618, lang="it"), "seicentodiciotto")
self.assertEqual(num2words(718, lang="it"), "settecentodiciotto")
self.assertEqual(num2words(818, lang="it"), "ottocentodiciotto")
self.assertEqual(num2words(918, lang="it"), "novecentodiciotto")


def test_big(self):
self.assertEqual(num2words(1000000, lang="it"), "un milione")
self.assertEqual(num2words(1000007, lang="it"), "un milione e sette")
Expand Down
Loading