p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #28221 -- Honor plural number in JavaScriptCatalog

This commit is contained in:
Claude Paroz 2017-05-18 15:00:42 +02:00
parent 59ab1b2683
commit eb66057c1e
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
django/views/i18n.py
View File

@ -1,6 +1,7 @@
import itertools import itertools
import json import json
import os import os
import re
from urllib.parse import unquote from urllib.parse import unquote
from django.apps import apps from django.apps import apps
@ -234,12 +235,31 @@ class JavaScriptCatalog(View):
# paths of requested packages # paths of requested packages
return [os.path.join(app.path, 'locale') for app in app_configs] return [os.path.join(app.path, 'locale') for app in app_configs]
def get_plural(self): @property
plural = None def _num_plurals(self):
"""
Return the number of plurals for this catalog language, or 2 if no
plural string is available.
"""
match = re.search(r'nplurals=\s*(\d+)', self._plural_string or '')
if match:
return int(match.groups()[0])
return 2
@property
def _plural_string(self):
"""
Return the plural string (including nplurals) for this catalog language,
or None if no plural string is available.
"""
if '' in self.translation._catalog: if '' in self.translation._catalog:
for line in self.translation._catalog[''].split('\n'): for line in self.translation._catalog[''].split('\n'):
if line.startswith('Plural-Forms:'): if line.startswith('Plural-Forms:'):
plural = line.split(':', 1)[1].strip() return line.split(':', 1)[1].strip()
return None
def get_plural(self):
plural = self._plural_string
if plural is not None: if plural is not None:
# This should be a compiled function of a typical plural-form: # This should be a compiled function of a typical plural-form:
# Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : # Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :
@ -249,7 +269,7 @@ class JavaScriptCatalog(View):
def get_catalog(self): def get_catalog(self):
pdict = {} pdict = {}
maxcnts = {} num_plurals = self._num_plurals
catalog = {} catalog = {}
trans_cat = self.translation._catalog trans_cat = self.translation._catalog
trans_fallback_cat = self.translation._fallback._catalog if self.translation._fallback else {} trans_fallback_cat = self.translation._fallback._catalog if self.translation._fallback else {}
@ -259,14 +279,12 @@ class JavaScriptCatalog(View):
if isinstance(key, str): if isinstance(key, str):
catalog[key] = value catalog[key] = value
elif isinstance(key, tuple): elif isinstance(key, tuple):
msgid = key[0] msgid, cnt = key
cnt = key[1]
maxcnts[msgid] = max(cnt, maxcnts.get(msgid, 0))
pdict.setdefault(msgid, {})[cnt] = value pdict.setdefault(msgid, {})[cnt] = value
else: else:
raise TypeError(key) raise TypeError(key)
for k, v in pdict.items(): for k, v in pdict.items():
catalog[k] = [v.get(i, '') for i in range(maxcnts[k] + 1)] catalog[k] = [v.get(i, '') for i in range(num_plurals)]
return catalog return catalog
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):