Skip to content

Allow passthrough of xgettext's plural templates #1185

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow passthrough of xgettext's plural templates #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ff584
Do not implicitly mutate Catalog when accessing its properties
akx Feb 3, 2025
6cf8070
Allow passthrough of xgettext's plural templates
akx Feb 3, 2025
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
19 changes: 11 additions & 8 deletions babel/messages/catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,9 @@ def __init__(

# Dictionary of obsolete messages
self.obsolete: dict[str | tuple[str, str], Message] = {}
self._num_plurals = None
self._plural_expr = None

self._num_plurals: str | int | None = None
self._plural_expr: str | None = None

def _set_locale(self, locale: Locale | str | None) -> None:
if locale is None:
Expand Down Expand Up @@ -538,7 +539,8 @@ def _set_mime_headers(self, headers: Iterable[tuple[str, str]]) -> None:
self.charset = params['charset'].lower()
elif name == 'plural-forms':
params = parse_separated_header(f" ;{value}")
self._num_plurals = int(params.get('nplurals', 2))
nplurals = params.get('nplurals')
self._num_plurals = int(nplurals, 10) if nplurals.isdigit() else nplurals
self._plural_expr = params.get('plural', '(n != 1)')
elif name == 'pot-creation-date':
self.creation_date = _parse_datetime_header(value)
Expand Down Expand Up @@ -600,20 +602,21 @@ def _set_mime_headers(self, headers: Iterable[tuple[str, str]]) -> None:
""")

@property
def num_plurals(self) -> int:
def num_plurals(self) -> int | str:
"""The number of plurals used by the catalog or locale.

If read from a catalog template, this may be a string.

>>> Catalog(locale='en').num_plurals
2
>>> Catalog(locale='ga').num_plurals
5

:type: `int`"""
"""
if self._num_plurals is None:
num = 2
if self.locale:
num = get_plural(self.locale)[0]
self._num_plurals = num
return num
return self._num_plurals

@property
Expand All @@ -632,7 +635,7 @@ def plural_expr(self) -> str:
expr = '(n != 1)'
if self.locale:
expr = get_plural(self.locale)[1]
self._plural_expr = expr
return expr
return self._plural_expr

@property
Expand Down
14 changes: 14 additions & 0 deletions tests/messages/test_pofile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,3 +1096,17 @@ def test_issue_1134(case: str, abort_invalid: bool):
output = pofile.read_po(buf)
assert len(output) == 1
assert output["foo"].string in ((''), ('', ''))


def test_issue_1154():
# Via `echo 'ngettext("Hello World!", "Hello Worlds!", 3);' | xgettext --output=- - --language=C`,
# minimized for reproducing the issue.
template = """
msgid ""
msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
""".strip()
cat = pofile.read_po(StringIO(template))
assert cat.num_plurals == "INTEGER"
assert cat.plural_expr == "EXPRESSION"
assert cat.plural_forms == "nplurals=INTEGER; plural=EXPRESSION;"
Loading