Skip to content
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

Romanian issues 259 #260

Merged
merged 9 commits into from
Dec 31, 2019
Merged

Romanian issues 259 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bdf651d
romanian-issues-259: rough implementation
mariaS210 Jun 9, 2019
a192afe
romanian-issues-259: test new branch
mariaS210 Jun 9, 2019
7e893f1
Merge branch 'master' into romanian-issues-259
erozqba Oct 25, 2019
9290282
Merge branch 'master' into romanian-issues-259
erozqba Oct 26, 2019
9943be7
Merge branch 'master' into romanian-issues-259
mariaS210 Oct 28, 2019
b362b7b
romanian-issues-259: implement and use pluralize
mariaS210 Nov 7, 2019
09d5da3
romanian-issues-259: fix linter error
mariaS210 Nov 7, 2019
dc7f790
romanian-issues-259: revert a test
mariaS210 Nov 7, 2019
ff9bd86
Merge branch 'master' into romanian-issues-259
erozqba Dec 31, 2019
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: 1 addition & 1 deletion num2words/lang_EU.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Num2Word_EU(Num2Word_Base):
'NOK': (('krone', 'kroner'), ('øre', 'øre')),
'PLN': (('zloty', 'zlotys', 'zlotu'), ('grosz', 'groszy')),
'MXN': (('peso', 'pesos'), GENERIC_CENTS),
'RON': (('leu', 'lei'), ('ban', 'bani')),
'RON': (('leu', 'lei', 'de lei'), ('ban', 'bani', 'de bani')),
'INR': (('rupee', 'rupees'), ('paisa', 'paise'))
}

Expand Down
81 changes: 59 additions & 22 deletions num2words/lang_RO.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
class Num2Word_RO(lang_EU.Num2Word_EU):
GIGA_SUFFIX = "iliard/e"
MEGA_SUFFIX = "ilion"
# inflection for million follows different rule
# inflection for mi/billion follows different rule
MEGA_SUFFIX_I = "ilioane"
GIGA_SUFFIX_I = "iliarde"

def setup(self):
super(Num2Word_RO, self).setup()
Expand All @@ -48,13 +49,13 @@ def setup(self):
"unu", "zero"]
self.gen_numwords = ["", "o", "două", "trei", "patru", "cinci",
"șase", "șapte", "opt", "nouă"]
self.gen_numwords_m = ["", "un", "două", "trei", "patru", "cinci",
self.gen_numwords_n = ["", "un", "două", "trei", "patru", "cinci",
"șase", "șapte", "opt", "nouă"]
self.numwords_inflections = {
100: self.gen_numwords,
1000: self.gen_numwords,
1000000: self.gen_numwords_m,
1000000000: self.gen_numwords_m
1000000: self.gen_numwords_n,
1000000000: self.gen_numwords_n
}
self.ords = {"unu": "primul",
"doi": "al doilea",
Expand All @@ -67,24 +68,29 @@ def setup(self):
def merge(self, lpair, rpair):
ltext, lnum = lpair
rtext, rnum = rpair
rtext_i = self.inflect(rnum, rtext)
if lnum > 1 and rtext_i.endswith(self.MEGA_SUFFIX):
rtext_i = rtext_i.replace(self.MEGA_SUFFIX, self.MEGA_SUFFIX_I)
rtext_i = self.inflect(rnum, rtext, lnum)
if 1 <= lnum < 10:
if rnum not in self.numwords_inflections:
return (rtext, rnum)
else:
rtext_i = self.inflect(lnum * rnum, rtext)
rtext_i = self.inflect(lnum * rnum, rtext, lnum)
lresult = (self.numwords_inflections[rnum][lnum], rtext_i)
return ("%s %s" % lresult, rnum)
elif 10 < lnum < 100:
if lnum % 10 == 0:
return ("%s și %s" % (ltext, rtext), lnum + rnum)
if rnum in self.numwords_inflections:
rtext_i = self.inflect(lnum * rnum, rtext, lnum)
return ("%s %s" % (ltext, rtext_i), lnum * rnum)
else:
return ("%s și %s" % (ltext, rtext), lnum + rnum)
else:
return ("%s %s" % (ltext, rtext_i), lnum * rnum)
rtext_i = self.inflect(lnum * rnum, rtext, lnum)
ltext_i = ltext if lnum % 10 != 2 \
else ltext.replace("doi", "două")
return ("%s %s" % (ltext_i, rtext_i), lnum * rnum)
else:
if rnum in self.numwords_inflections:
rtext_i = self.inflect(lnum * rnum, rtext)
rtext_i = self.inflect(lnum * rnum, rtext, lnum)
return ("%s %s" % (ltext, rtext_i), lnum * rnum)

def to_ordinal(self, value):
Expand All @@ -101,21 +107,52 @@ def to_ordinal_num(self, value):
return "1-ul"
return "al %s-lea" % (value)

def inflect(self, value, text):
def pluralize(self, n, forms):
if n == 1:
form = 0
elif n == 0 or (n % 100 > 0 and n % 100 < 20):
form = 1
else:
form = 2
return forms[form]

def inflect(self, value, text, side_effect=-1):
text = text.split("/")
if value in (1, 100, 1000, 100000, 1000000000):
return text[0]
if len(text) > 1 and text[0][-1] in "aăeiou":
text[0] = text[0][:-1]
return "".join(text)
result = text[0]
if len(text) > 1:
forms = [
text[0],
text[0][:-1] + text[1],
"de " + text[0][:-1] + text[1]
]
result = self.pluralize(side_effect, forms)
# mega inflections are different
if side_effect > 1 and result.endswith(self.MEGA_SUFFIX):
result = result.replace(self.MEGA_SUFFIX, self.MEGA_SUFFIX_I)
elif side_effect > 1 and result.endswith("iliare"):
result = result.replace("iliare", self.GIGA_SUFFIX_I)
return result

def to_currency(self, val, longval=True, old=False):
cents = int(round(val*100))
result = self.to_splitnum(cents, hightxt="leu/i", lowtxt="ban/i",
divisor=100, jointxt="și", longval=longval)
def to_currency(self, val, currency="RON", cents=False, separator=" și",
adjective=False):
# romanian currency has a particularity for numeral: one
self.gen_numwords[1] = "una"
result = super(Num2Word_RO, self).to_currency(
int(round(val*100)),
currency,
True,
separator,
adjective
)
self.gen_numwords[1] = "o" # revert numeral
return result.replace(
"unu leu", "un leu"
).replace("unu ban", "un ban")
).replace(
"unu ban", "un ban"
).replace(
# if the romanian low text is 0, it is not usually printed
separator + " zero bani", ""
)

def to_year(self, val, suffix=None, longval=True):
result = super(Num2Word_RO, self).to_year(
Expand Down
38 changes: 30 additions & 8 deletions tests/test_ro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def test_big_numbers(self):
)
self.assertEqual(
num2words(247000000000, lang="ro"),
u"două sute patruzeci și șapte miliarde"
u"două sute patruzeci și șapte de miliarde"
)

def test_overflow(self):
Expand All @@ -116,24 +116,46 @@ def test_overflow(self):
"0000000000000000000000000000000000000")

def test_to_currency(self):
self.assertEqual(
num2words(1000, lang='ro', to='currency'),
u'una mie de lei'
)
self.assertEqual(
num2words(101, lang='ro', to='currency'),
u'una sută unu lei'
)
self.assertEqual(
num2words(100, lang='ro', to='currency'),
u'una sută de lei'
)
self.assertEqual(
num2words(38.4, lang='ro', to='currency'),
u'treizeci și opt lei și patruzeci bani'
u'treizeci și opt de lei și patruzeci de bani'
)

self.assertEqual(
num2words(1.01, lang='ro', to='currency'),
u'un leu și un ban'
)

self.assertEqual(
num2words(4778.00, lang='ro', to='currency'),
u'patru mii șapte sute șaptezeci și opt lei')

u'patru mii șapte sute șaptezeci și opt de lei')
self.assertEqual(
num2words(4778.32, lang='ro', to='currency'),
u'patru mii șapte sute șaptezeci și opt lei'
u' și treizeci și doi bani')
u'patru mii șapte sute șaptezeci și opt de lei'
u' și treizeci și doi de bani')
self.assertEqual(
num2words(1207, lang='ro', to='currency'),
u'una mie două sute șapte lei')
self.assertEqual(
num2words(22000, lang='ro', to='currency'),
u'douăzeci și două de mii de lei')
self.assertEqual(
num2words(80000, lang='ro', to='currency'),
u'optzeci de mii de lei')
self.assertEqual(
num2words(123456789, lang='ro', to='currency'),
u'una sută douăzeci și trei milioane patru sute '
u'cincizeci și șase de mii șapte sute optzeci și nouă de lei')

def test_to_year(self):
self.assertEqual(num2words(1989, lang='ro', to='year'),
Expand Down