Skip to content

Preserve leading fractional zeros in plural operands #1342

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

Open
emme1t wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve leading fractional zeros in plural operands #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions babel/plural.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ def extract_operands(
fraction_digits = dec_tuple.digits[exp:] if exp < 0 else ()
trailing = ''.join(str(d) for d in fraction_digits)
no_trailing = trailing.rstrip('0')
v = len(trailing)
w = len(no_trailing)
# The exponent includes leading zeros in the fractional part.
v = max(-exp, 0)
w = v - len(trailing) + len(no_trailing) if no_trailing else 0
f = int(trailing or 0)
t = int(no_trailing or 0)
else:
Expand Down
19 changes: 19 additions & 0 deletions tests/test_plural.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ def test_plural_rule_operands_w():
assert rule(1.2) == 'other'


@pytest.mark.parametrize('source', [decimal.Decimal('0.00100'), decimal.Decimal('-0.00100')])
def test_plural_rule_operands_with_leading_fraction_zeros(source):
assert plural.PluralRule({'one': 'v is 5'})(source) == 'one'
assert plural.PluralRule({'one': 'w is 3'})(source) == 'one'


@pytest.mark.parametrize('source', [decimal.Decimal('0.011'), 0.011])
def test_latvian_plural_with_leading_fraction_zero(source):
assert Locale('lv').plural_form(source) == 'one'
assert Locale('lv').plural_form(decimal.Decimal('0.11')) == 'zero'


def test_plural_rule_operands_f():
rule = plural.PluralRule({'one': 'f is 20'})
assert rule(decimal.Decimal('1.23')) == 'other'
Expand Down Expand Up @@ -221,6 +233,13 @@ def test_next_token_type_not_ok_and_value_ok():
(decimal.Decimal('1.30'), '1.30', 1, 2, 1, 30, 3),
(decimal.Decimal('1.03'), '1.03', 1, 2, 2, 3, 3),
(decimal.Decimal('1.230'), '1.230', 1, 3, 2, 230, 23),
(decimal.Decimal('0.001'), '0.001', 0, 3, 3, 1, 1),
(decimal.Decimal('0.00100'), '0.00100', 0, 5, 3, 100, 1),
(decimal.Decimal('-0.0100'), '0.0100', 0, 4, 2, 100, 1),
(decimal.Decimal('0.00'), '0.00', 0, 2, 0, 0, 0),
(decimal.Decimal('-0.000'), '0.000', 0, 3, 0, 0, 0),
(decimal.Decimal('1E+3'), '1000', 1000, 0, 0, 0, 0),
(0.001, '0.001', 0, 3, 3, 1, 1),
(-1, 1, 1, 0, 0, 0, 0),
(1.3, '1.3', 1, 1, 1, 3, 3),
)
Expand Down