Fixed #12777 - Localize decimal fields correctly. Thanks, Florian Apolloner

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12382 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 5 deletions

diff --git a/django/utils/formats.py b/django/utils/formats.py
index 77479ae2a6..88f744b96d 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -80,11 +80,7 @@ def localize(value):
     formatted as a string using current locale format
     """
     if settings.USE_L10N:
-        if isinstance(value, decimal.Decimal):
-            return number_format(value)
-        elif isinstance(value, float):
-            return number_format(value)
-        elif isinstance(value, int):
+        if isinstance(value, (decimal.Decimal, float, int)):
             return number_format(value)
         elif isinstance(value, datetime.datetime):
             return date_format(value, 'DATETIME_FORMAT')
@@ -99,6 +95,8 @@ def localize_input(value, default=None):
     Checks if an input value is a localizable type and returns it
     formatted with the appropriate formatting string of the current locale.
     """
+    if isinstance(value, (decimal.Decimal, float, int)):
+        return number_format(value)
     if isinstance(value, datetime.datetime):
         value = datetime_safe.new_datetime(value)
         format = smart_str(default or get_format('DATETIME_INPUT_FORMATS')[0])