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

Improve Ukrainian support and minor fixes in CZ, KZ, LT, LV, PL, RU, SR languages #400

Merged
merged 10 commits into from
Jun 30, 2021
Merged

Improve Ukrainian support and minor fixes in CZ, KZ, LT, LV, PL, RU, SR languages #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb3d7ef
Fix English char 'i' in Ukrainian words
rostyslav80 May 25, 2021
285a4c6
Fix the feminine currency processing for UAH in lang_UK.py
rostyslav80 May 27, 2021
0accda2
Fix test_ua.py
rostyslav80 May 27, 2021
9e1f0c7
Fix the feminine currency processing for UAH in lang_RU.py
rostyslav80 May 27, 2021
5981998
Add tests for UAH in test_ru.py
rostyslav80 May 27, 2021
6288839
Add world currencies to lang_UK.py; Add test cases to test_uk.py for …
rostyslav80 Jun 4, 2021
cad28e3
Fix incorrect handling of zeros after decimal point for CZ, KZ, LT, L…
rostyslav80 Jun 5, 2021
4942085
Add ukrainian ordinal numbers
rostyslav80 Jun 10, 2021
d4b32d2
Fix too long lines of code
rostyslav80 Jun 10, 2021
cef2d83
Add test for negative cardinal number
rostyslav80 Jun 10, 2021
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
6 changes: 5 additions & 1 deletion num2words/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ def pluralize(self, n, forms):
"""
raise NotImplementedError

def _money_verbose(self, number, currency):
return self.to_cardinal(number)

def _cents_verbose(self, number, currency):
return self.to_cardinal(number)

Expand Down Expand Up @@ -290,12 +293,13 @@ def to_currency(self, val, currency='EUR', cents=True, separator=',',
cr1 = prefix_currency(self.CURRENCY_ADJECTIVES[currency], cr1)

minus_str = "%s " % self.negword if is_negative else ""
money_str = self._money_verbose(left, currency)
cents_str = self._cents_verbose(right, currency) \
if cents else self._cents_terse(right, currency)

return u'%s%s %s%s %s %s' % (
minus_str,
self.to_cardinal(left),
money_str,
self.pluralize(left, cr1),
separator,
cents_str,
Expand Down
5 changes: 4 additions & 1 deletion num2words/lang_CZ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,13 @@ def to_cardinal(self, number):
n = str(number).replace(',', '.')
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right)))
return u'%s %s %s' % (
self._int2word(int(left)),
self.pointword,
self._int2word(int(right))
decimal_part
)
else:
return self._int2word(int(n))
Expand Down
3 changes: 2 additions & 1 deletion num2words/lang_KZ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@ def to_cardinal(self, number):
n = str(number).replace(',', '.')
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
return u'%s %s %s' % (
self._int2word(int(left)),
self.pointword,
self._int2word(int(right))
(ZERO + ' ') * leading_zero_count + self._int2word(int(right))
mromdhane marked this conversation as resolved.
Show resolved Hide resolved
)
else:
return self._int2word(int(n))
Expand Down
5 changes: 4 additions & 1 deletion num2words/lang_LT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,14 @@ def to_cardinal(self, number):
base_str, n = self.parse_minus(n)
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right)))
return '%s%s %s %s' % (
base_str,
self._int2word(int(left)),
self.pointword,
self._int2word(int(right))
decimal_part
)
else:
return "%s%s" % (base_str, self._int2word(int(n)))
Expand Down
5 changes: 4 additions & 1 deletion num2words/lang_LV.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,14 @@ def to_cardinal(self, number):
base_str, n = self.parse_minus(n)
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right)))
return '%s%s %s %s' % (
base_str,
self._int2word(int(left)),
self.pointword,
self._int2word(int(right))
decimal_part
)
else:
return "%s%s" % (base_str, self._int2word(int(n)))
Expand Down
5 changes: 4 additions & 1 deletion num2words/lang_PL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,13 @@ def to_cardinal(self, number):
n = str(number).replace(',', '.')
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right)))
return u'%s %s %s' % (
self._int2word(int(left)),
self.pointword,
self._int2word(int(right))
decimal_part
)
else:
return self._int2word(int(n))
Expand Down
10 changes: 8 additions & 2 deletions num2words/lang_RU.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,13 @@ def to_cardinal(self, number):
n = str(number).replace(',', '.')
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right)))
return u'%s %s %s' % (
self._int2word(int(left)),
self.pointword,
self._int2word(int(right))
decimal_part
)
else:
return self._int2word(int(n))
Expand Down Expand Up @@ -201,8 +204,11 @@ def to_ordinal(self, number):
outwords[-1] = self.title(lastword)
return " ".join(outwords).strip()

def _money_verbose(self, number, currency):
return self._int2word(number, currency == 'UAH')

def _cents_verbose(self, number, currency):
return self._int2word(number, currency == 'RUB')
return self._int2word(number, currency in ('UAH', 'RUB'))

def _int2word(self, n, feminine=False):
if n < 0:
Expand Down
5 changes: 4 additions & 1 deletion num2words/lang_SR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,13 @@ def to_cardinal(self, number, feminine=False):
n = str(number).replace(',', '.')
if '.' in n:
left, right = n.split('.')
leading_zero_count = len(right) - len(right.lstrip('0'))
decimal_part = ((ZERO[0] + ' ') * leading_zero_count +
self._int2word(int(right), feminine))
return u'%s %s %s' % (
self._int2word(int(left), feminine),
self.pointword,
self._int2word(int(right), feminine)
decimal_part
)
else:
return self._int2word(int(n), feminine)
Expand Down
Loading