Skip to content

Fix contextual plural lookup in upgettext #1377

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
00200200 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −0
Open

Fix contextual plural lookup in upgettext #1377

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
2 changes: 2 additions & 0 deletions babel/support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,8 @@ def upgettext(self, context: str, message: str) -> str:
ctxt_message_id = self.CONTEXT_ENCODING % (context, message)
missing = object()
tmsg = self._catalog.get(ctxt_message_id, missing)
if tmsg is missing:
tmsg = self._catalog.get((ctxt_message_id, self.plural(1)), missing)
if tmsg is missing:
if self._fallback:
return self._fallback.upgettext(context, message)
Expand Down
19 changes: 19 additions & 0 deletions tests/test_support_translations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,25 @@ def test_upgettext(translations):
assert_equal_type_too('VohCTX', translations.upgettext('foo', 'foo'))


@pytest.mark.parametrize('use_fallback', [False, True])
def test_upgettext_plural_entry(translations, use_fallback):
if use_fallback:
primary = support.Translations()
primary.add_fallback(translations)
translations = primary

expected = translations.pgettext('foo', 'foo1')
assert_equal_type_too('VohCTX1', expected)
assert_equal_type_too(expected, translations.upgettext('foo', 'foo1'))


@pytest.mark.parametrize('method', ['udpgettext', 'dupgettext'])
def test_upgettext_plural_entry_in_domain(translations, method):
expected = translations.dpgettext('messages1', 'foo', 'foo1')
assert_equal_type_too('VohCTXD1', expected)
assert_equal_type_too(expected, getattr(translations, method)('messages1', 'foo', 'foo1'))


@pytest.mark.skipif(SKIP_LGETTEXT, reason='lgettext is deprecated')
def test_lpgettext(translations):
assert_equal_type_too(b'Voh', translations.lgettext('foo'))
Expand Down