Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions babel/messages/catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -1009,11 +1009,13 @@ def _merge(
if not isinstance(message.string, (list, tuple)):
fuzzy = True
message.string = tuple(
[message.string] + ([''] * (len(message.id) - 1)),
[message.string] + ([''] * (self.num_plurals - 1)),
)
elif len(message.string) != self.num_plurals:
fuzzy = True
message.string = tuple(message.string[: len(oldmsg.string)])
message.string = tuple(message.string[:self.num_plurals]) + (
('',) * max(0, self.num_plurals - len(message.string))
)
elif isinstance(message.string, (list, tuple)):
fuzzy = True
message.string = message.string[0]
Expand Down
29 changes: 29 additions & 0 deletions tests/messages/test_catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,35 @@ def test_catalog_update_message_changed_to_plural():
assert cat['foo'].fuzzy


@pytest.mark.parametrize(('locale', 'expected'), [('ja', ('Voh',)), ('ru', ('Voh', '', ''))])
def test_catalog_update_message_changed_to_plural_uses_locale(locale, expected):
cat = catalog.Catalog(locale=locale)
cat.add('foo', 'Voh')
tmpl = catalog.Catalog()
tmpl.add(('foo', 'foos'))
cat.update(tmpl)
assert cat['foo'].string == expected
assert cat['foo'].fuzzy
assert cat['foo'].check(cat) == []


@pytest.mark.parametrize(
('locale', 'translations', 'expected'),
[('ru', ('one', 'many'), ('one', 'many', '')),
('ja', ('one', 'many'), ('one',)),
('ru', ('one', 'few', 'many'), ('one', 'few', 'many'))],
)
def test_catalog_update_resizes_plural_translations(locale, translations, expected):
cat = catalog.Catalog(locale=locale)
cat.add(('foo', 'foos'), translations)
tmpl = catalog.Catalog()
tmpl.add(('foo', 'foos'))
cat.update(tmpl)
assert cat['foo'].string == expected
assert cat['foo'].fuzzy == (translations != expected)
assert cat['foo'].check(cat) == []


def test_catalog_update_message_changed_to_simple():
cat = catalog.Catalog()
cat.add('foo' 'foos', ('Voh', 'Vöhs'))
Expand Down