innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #25571 -- Fixed boolean evaluation of ungettext_lazy

This commit is contained in:
Claude Paroz 2015-10-19 21:46:55 +02:00
parent 1ce11f6064
commit 8b5acda821
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/utils/translation/__init__.py
View File

@ -107,6 +107,12 @@ def lazy_number(func, resultclass, number=None, **kwargs):
proxy = lazy(func, resultclass)(**kwargs) proxy = lazy(func, resultclass)(**kwargs)
else: else:
class NumberAwareString(resultclass): class NumberAwareString(resultclass):
def __bool__(self):
return bool(kwargs['singular'])
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def __mod__(self, rhs): def __mod__(self, rhs):
if isinstance(rhs, dict) and number: if isinstance(rhs, dict) and number:
try: try:

4
tests/i18n/tests.py
View File

@ -227,6 +227,10 @@ class TranslationTests(SimpleTestCase):
) )
self.assertEqual(result % {'name': 'Joe', 'num': 4}, "Joe has 4 good results") self.assertEqual(result % {'name': 'Joe', 'num': 4}, "Joe has 4 good results")
def test_ungettext_lazy_bool(self):
self.assertTrue(ungettext_lazy('%d good result', '%d good results'))
self.assertFalse(ungettext_lazy('', ''))
@override_settings(LOCALE_PATHS=extended_locale_paths) @override_settings(LOCALE_PATHS=extended_locale_paths)
def test_pgettext(self): def test_pgettext(self):
trans_real._active = local() trans_real._active = local()