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

Jump to bottom

Adding genders for Russian language #503

Merged
merged 10 commits into from
Sep 6, 2023
Merged

Adding genders for Russian language #503

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0cb3a44
Adding genders (m, f, n)
Mar 7, 2023
8d0814d
Fix E501 - line too long warning
Mar 7, 2023
cfb12d2
Merge branch 'savoirfairelinux:master' into master
smilingDima Apr 2, 2023
55061d6
RU - adding cases, plural and animate
Apr 2, 2023
c5c4c59
Fix error with ordinal 21000 ( https://russian.stackexchange.com/a/43…
Apr 3, 2023
373f642
Fix 100000 and 90000 ordinal exceptions
Apr 6, 2023
6a2c673
Merge branch 'savoirfairelinux:master' into master
smilingDima Apr 13, 2023
30a8810
Fixes for PEP8 compatibility
Apr 18, 2023
0d197d3
Merge branch 'master' of https://github.com/smilingDima/num2words
Apr 18, 2023
23b3788
Merge branch 'master' into master
mrodriguezg1991 Sep 6, 2023
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
219 changes: 128 additions & 91 deletions num2words/lang_RU.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,66 +20,78 @@
from .base import Num2Word_Base
from .utils import get_digits, splitbyx

ZERO = ('ноль',)

ONES_FEMININE = {
1: ('одна',),
2: ('две',),
3: ('три',),
4: ('четыре',),
5: ('пять',),
6: ('шесть',),
7: ('семь',),
8: ('восемь',),
9: ('девять',),
}
ZERO = 'ноль'

ONES = {
1: ('один',),
2: ('два',),
3: ('три',),
4: ('четыре',),
5: ('пять',),
6: ('шесть',),
7: ('семь',),
8: ('восемь',),
9: ('девять',),
'f': {
1: 'одна',
2: 'две',
3: 'три',
4: 'четыре',
5: 'пять',
6: 'шесть',
7: 'семь',
8: 'восемь',
9: 'девять',
},
'm': {
1: 'один',
2: 'два',
3: 'три',
4: 'четыре',
5: 'пять',
6: 'шесть',
7: 'семь',
8: 'восемь',
9: 'девять',
},
'n': {
1: 'одно',
2: 'два',
3: 'три',
4: 'четыре',
5: 'пять',
6: 'шесть',
7: 'семь',
8: 'восемь',
9: 'девять',
}
}

TENS = {
0: ('десять',),
1: ('одиннадцать',),
2: ('двенадцать',),
3: ('тринадцать',),
4: ('четырнадцать',),
5: ('пятнадцать',),
6: ('шестнадцать',),
7: ('семнадцать',),
8: ('восемнадцать',),
9: ('девятнадцать',),
0: 'десять',
1: 'одиннадцать',
2: 'двенадцать',
3: 'тринадцать',
4: 'четырнадцать',
5: 'пятнадцать',
6: 'шестнадцать',
7: 'семнадцать',
8: 'восемнадцать',
9: 'девятнадцать',
}

TWENTIES = {
2: ('двадцать',),
3: ('тридцать',),
4: ('сорок',),
5: ('пятьдесят',),
6: ('шестьдесят',),
7: ('семьдесят',),
8: ('восемьдесят',),
9: ('девяносто',),
2: 'двадцать',
3: 'тридцать',
4: 'сорок',
5: 'пятьдесят',
6: 'шестьдесят',
7: 'семьдесят',
8: 'восемьдесят',
9: 'девяносто',
}

HUNDREDS = {
1: ('сто',),
2: ('двести',),
3: ('триста',),
4: ('четыреста',),
5: ('пятьсот',),
6: ('шестьсот',),
7: ('семьсот',),
8: ('восемьсот',),
9: ('девятьсот',),
1: 'сто',
2: 'двести',
3: 'триста',
4: 'четыреста',
5: 'пятьсот',
6: 'шестьсот',
7: 'семьсот',
8: 'восемьсот',
9: 'девятьсот',
}

THOUSANDS = {
Expand Down Expand Up @@ -136,52 +148,49 @@ def setup(self):
"восемь": "восьмой",
"девять": "девятый",
"сто": "сотый"}
self.ords_feminine = {"один": "",
"одна": "",
"две": "двух",
"три": "трёх",
"четыре": "четырёх",
"пять": "пяти",
"шесть": "шести",
"семь": "семи",
"восемь": "восьми",
"девять": "девяти"}

def to_cardinal(self, number):
self.ords_adjective = {"один": "",
"одна": "",
"две": "двух",
"три": "трёх",
"четыре": "четырёх",
"пять": "пяти",
"шесть": "шести",
"семь": "семи",
"восемь": "восьми",
"девять": "девяти"}

def to_cardinal(self, number, gender='m'):
n = str(number).replace(',', '.')
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
smilingDima marked this conversation as resolved.
Show resolved Hide resolved
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right)))
decimal_part = ((ZERO + ' ') * leading_zero_count +
self._int2word(int(right), gender))
return u'%s %s %s' % (
self._int2word(int(left)),
self._int2word(int(left), gender),
self.pointword,
decimal_part
)
else:
return self._int2word(int(n))
return self._int2word(int(n), gender)

def pluralize(self, n, forms):
if n % 100 < 10 or n % 100 > 20:
if n % 10 == 1:
form = 0
elif 5 > n % 10 > 1:
form = 1
else:
form = 2
else:
form = 2
return forms[form]
if n % 100 in (11, 12, 13, 14):
return forms[2]
if n % 10 == 1:
return forms[0]
if n % 10 in (2, 3, 4):
return forms[1]
return forms[2]

def to_ordinal(self, number):
def to_ordinal(self, number, gender='m'):
self.verify_ordinal(number)
outwords = self.to_cardinal(number).split(" ")
outwords = self.to_cardinal(number, 'm').split(" ")
lastword = outwords[-1].lower()
try:
if len(outwords) > 1:
if outwords[-2] in self.ords_feminine:
outwords[-2] = self.ords_feminine.get(
if outwords[-2] in self.ords_adjective:
outwords[-2] = self.ords_adjective.get(
outwords[-2], outwords[-2])
elif outwords[-2] == 'десять':
outwords[-2] = outwords[-2][:-1] + 'и'
Expand All @@ -190,8 +199,8 @@ def to_ordinal(self, number):
outwords[-3] = ''
lastword = self.ords[lastword]
except KeyError:
if lastword[:-3] in self.ords_feminine:
lastword = self.ords_feminine.get(
if lastword[:-3] in self.ords_adjective:
lastword = self.ords_adjective.get(
lastword[:-3], lastword) + "сотый"
elif lastword[-1] == "ь" or lastword[-2] == "т":
lastword = lastword[:-1] + "ый"
Expand All @@ -208,21 +217,43 @@ def to_ordinal(self, number):
lastword = lastword[:lastword.rfind('н') + 1] + "ный"
elif lastword[-1] == "д" or lastword[-2] == "д":
lastword = lastword[:lastword.rfind('д') + 1] + "ный"

if gender == 'f':
if lastword[-2:] == "ий":
lastword = lastword[:-2] + "ья"
else:
lastword = lastword[:-2] + "ая"
if gender == 'n':
if lastword[-2:] == "ий":
lastword = lastword[:-2] + "ье"
else:
lastword = lastword[:-2] + "ое"

outwords[-1] = self.title(lastword)
return " ".join(outwords).strip()

def _money_verbose(self, number, currency):
return self._int2word(number, currency == 'UAH')
if currency == 'UAH':
gender = 'f'
else:
gender = 'm'

return self._int2word(number, gender)

def _cents_verbose(self, number, currency):
return self._int2word(number, currency in ('UAH', 'RUB', 'BYN'))
if currency in ('UAH', 'RUB', 'BYN'):
gender = 'f'
else:
gender = 'm'

return self._int2word(number, gender)

def _int2word(self, n, feminine=False):
def _int2word(self, n, gender):
smilingDima marked this conversation as resolved.
Show resolved Hide resolved
if n < 0:
return ' '.join([self.negword, self._int2word(abs(n))])
return ' '.join([self.negword, self._int2word(abs(n), gender)])

if n == 0:
return ZERO[0]
return ZERO

words = []
chunks = list(splitbyx(str(n), 3))
Expand All @@ -236,16 +267,22 @@ def _int2word(self, n, feminine=False):
n1, n2, n3 = get_digits(x)

if n3 > 0:
words.append(HUNDREDS[n3][0])
words.append(HUNDREDS[n3])

if n2 > 1:
words.append(TWENTIES[n2][0])
words.append(TWENTIES[n2])

if n2 == 1:
words.append(TENS[n1][0])
words.append(TENS[n1])
elif n1 > 0:
ones = ONES_FEMININE if i == 1 or feminine and i == 0 else ONES
words.append(ones[n1][0])
if i == 0:
ones = ONES[gender]
elif i == 1:
ones = ONES['f'] # Thousands is feminine
else:
ones = ONES['m']

words.append(ones[n1])

if i > 0:
words.append(self.pluralize(x, THOUSANDS[i]))
Expand Down
75 changes: 75 additions & 0 deletions tests/test_ru.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,45 @@ def test_cardinal(self):
self.assertEqual(num2words(-15, lang='ru'), "минус пятнадцать")
self.assertEqual(num2words(-100, lang='ru'), "минус сто")

def test_feminine(self):
self.assertEqual(num2words(1, lang='ru', gender='f'), 'одна')
self.assertEqual(num2words(2, lang='ru', gender='f'), 'две')
self.assertEqual(num2words(3, lang='ru', gender='f'), 'три')
self.assertEqual(num2words(100, lang='ru', gender='f'), "сто")
self.assertEqual(num2words(101, lang='ru', gender='f'), "сто одна")
self.assertEqual(num2words(110, lang='ru', gender='f'), "сто десять")
self.assertEqual(
num2words(115, lang='ru', gender='f'), "сто пятнадцать"
)
self.assertEqual(
num2words(122, lang='ru', gender='f'), "сто двадцать две"
)
self.assertEqual(
num2words(125.1, lang='ru', gender='f'),
'сто двадцать пять запятая одна'
)
self.assertEqual(num2words(-1, lang='ru', gender='f'), "минус одна")
self.assertEqual(num2words(-100, lang='ru', gender='f'), "минус сто")

def test_neuter(self):
self.assertEqual(num2words(1, lang='ru', gender='n'), 'одно')
self.assertEqual(num2words(2, lang='ru', gender='n'), 'два')
self.assertEqual(num2words(3, lang='ru', gender='n'), 'три')
self.assertEqual(num2words(100, lang='ru', gender='n'), "сто")
self.assertEqual(num2words(101, lang='ru', gender='n'), "сто одно")
self.assertEqual(num2words(110, lang='ru', gender='n'), "сто десять")
self.assertEqual(
num2words(115, lang='ru', gender='n'), "сто пятнадцать"
)
self.assertEqual(
num2words(122, lang='ru', gender='n'),"сто двадцать два"
)
self.assertEqual(
num2words(125.1, lang='ru', gender='n'),
'сто двадцать пять запятая одно')
self.assertEqual(num2words(-1, lang='ru', gender='n'), "минус одно")
self.assertEqual(num2words(-100, lang='ru', gender='n'), "минус сто")

def test_floating_point(self):
self.assertEqual(num2words(5.2, lang='ru'), "пять запятая два")
self.assertEqual(
Expand Down Expand Up @@ -159,6 +198,42 @@ def test_to_ordinal(self):
'миллиардный'
)

def test_to_ordinal_feminine(self):
self.assertEqual(
num2words(1, lang='ru', to='ordinal', gender='f'), 'первая'
)
self.assertEqual(
num2words(3, lang='ru', to='ordinal', gender='f'), 'третья'
)
self.assertEqual(
num2words(10, lang='ru', to='ordinal', gender='f'), 'десятая'
)
self.assertEqual(
num2words(23, lang='ru', to='ordinal', gender='f'),
'двадцать третья'
)
self.assertEqual(
num2words(1000, lang='ru', to='ordinal', gender='f'), 'тысячная'
smilingDima marked this conversation as resolved.
Show resolved Hide resolved
)

def test_to_ordinal_neuter(self):
self.assertEqual(
num2words(1, lang='ru', to='ordinal', gender='n'), 'первое'
)
self.assertEqual(
num2words(3, lang='ru', to='ordinal', gender='n'), 'третье'
)
self.assertEqual(
num2words(10, lang='ru', to='ordinal', gender='n'), 'десятое'
)
self.assertEqual(
num2words(23, lang='ru', to='ordinal', gender='n'),
'двадцать третье'
)
self.assertEqual(
num2words(1000, lang='ru', to='ordinal', gender='n'), 'тысячное'
)

def test_to_currency(self):
self.assertEqual(
num2words(1.0, lang='ru', to='currency', currency='EUR'),
Expand Down