summaryrefslogtreecommitdiff
path: root/django/utils/translation
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-02-02 10:56:41 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-02-02 10:58:31 +0100
commitace9d4efc3e6e0b07fd94b039d62e0d32c81ed3f (patch)
tree3577de1d382531ba5bfaf977041ac56d8438414a /django/utils/translation
parentdb5049c9f7c6347e4d7866599877beb9e8e78f60 (diff)
Made ungettext_lazy usable for messages that do not contain the count.
Fixed #19160 (again). Thanks Alexey Boriskin.
Diffstat (limited to 'django/utils/translation')
-rw-r--r--django/utils/translation/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 7a48376a52..6fd52b6023 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -106,7 +106,13 @@ def lazy_number(func, resultclass, number=None, **kwargs):
else:
number_value = rhs
kwargs['number'] = number_value
- return func(**kwargs) % rhs
+ translated = func(**kwargs)
+ try:
+ translated = translated % rhs
+ except TypeError:
+ # String doesn't contain a placeholder for the number
+ pass
+ return translated
proxy = lazy(lambda **kwargs: NumberAwareString(), NumberAwareString)(**kwargs)
return proxy