From fd7fa9850a5e6c193c1c8e4e14faae7b4a7f1bbc Mon Sep 17 00:00:00 2001 From: Krish Goradia Date: Mon, 16 Nov 2026 14:23:08 +0530 Subject: [PATCH] Fix catalog updates using the wrong plural form count --- babel/messages/catalog.py | 6 ++++-- tests/messages/test_catalog.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py index 0e7417020..060c1f8a1 100644 --- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -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] diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py index 2eaa508cb..dd7874b45 100644 --- a/tests/messages/test_catalog.py +++ b/tests/messages/test_catalog.py @@ -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'))