summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-08-31 16:45:10 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-08-31 16:45:10 +0000
commit9635ac07a5ee9a1ff54ebcfb08b48622356b0326 (patch)
tree3c6caad06d15be64a647e4d90e4159638b9d9001
parentcb6aa1035bf900e9f124e91c0521f7081ba105e3 (diff)
Fixed #403 -- Fixed bug in floatformat template filter. Thanks, nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/defaultfilters.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/django/core/defaultfilters.py b/django/core/defaultfilters.py
index f6fd420572..f0e743500a 100644
--- a/django/core/defaultfilters.py
+++ b/django/core/defaultfilters.py
@@ -23,14 +23,15 @@ def fix_ampersands(value, _):
def floatformat(text, _):
"""
- Displays a floating point number as 34.2 (with one decimal places) - but
+ Displays a floating point number as 34.2 (with one decimal place) - but
only if there's a point to be displayed
"""
+ from math import modf
if not text:
return ''
- if text - int(text) < 0.1:
- return int(text)
- return "%.1f" % text
+ if modf(float(text))[0] < 0.1:
+ return text
+ return "%.1f" % float(text)
def linenumbers(value, _):
"Displays text with line numbers"