mirror of
https://github.com/bblaz/num2words.git
synced 2025-12-06 06:42:25 +00:00
Merge pull request #1 from Cris140/master
To fix a problem in Brazilian Portuguese code referred to thousands when the hundreds are exact.
This commit is contained in:
@@ -53,6 +53,8 @@ class Num2Word_PT_BR(lang_PT.Num2Word_PT):
|
||||
ctext = "cento"
|
||||
|
||||
if nnum < cnum:
|
||||
if cnum < 100:
|
||||
return ("%s e %s" % (ctext, ntext), cnum + nnum)
|
||||
return ("%s e %s" % (ctext, ntext), cnum + nnum)
|
||||
|
||||
elif (not nnum % 1000000) and cnum > 1:
|
||||
@@ -75,7 +77,7 @@ class Num2Word_PT_BR(lang_PT.Num2Word_PT):
|
||||
for ext in (
|
||||
'mil', 'milhão', 'milhões', 'bilhão', 'bilhões',
|
||||
'trilhão', 'trilhões', 'quatrilhão', 'quatrilhões'):
|
||||
if re.match('.*{} e \\w*ento'.format(ext), result):
|
||||
if re.match('.*{} e \\w*entos? (?=.*e)'.format(ext), result):
|
||||
result = result.replace(
|
||||
'{} e'.format(ext), '{},'.format(ext), 1
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user