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

Fixed #14002 -- Modified filesize filter to ensure strings are translatable. Thanks to claudep for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-08-16 04:42:44 +00:00
parent 01720c979a
commit 842ceb5fe6
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
django/template/defaultfilters.py
View File

@ -807,19 +807,17 @@ def filesizeformat(bytes):
except (TypeError,ValueError,UnicodeDecodeError):
return u"0 bytes"
BYTE_UNITS = (
('KB', 1024),
('MB', 1024 * 1024),
('GB', 1024 * 1024 * 1024),
('TB', 1024 * 1024 * 1024 * 1024),
('PB', 1024 * 1024 * 1024 * 1024 * 1024)
)
if bytes < BYTE_UNITS[0][1]:
if bytes < 1024:
return ungettext("%(size)d byte", "%(size)d bytes", bytes) % {'size': bytes}
for index, (unit, unit_size) in enumerate(BYTE_UNITS):
if bytes < unit_size * 1024 or index == len(BYTE_UNITS) - 1:
return ugettext("%.1f %s") % (bytes / unit_size, unit)
if bytes < 1024 * 1024:
return ugettext("%.1f KB") % (bytes / 1024)
if bytes < 1024 * 1024 * 1024:
return ugettext("%.1f MB") % (bytes / (1024 * 1024))
if bytes < 1024 * 1024 * 1024 * 1024:
return ugettext("%.1f GB") % (bytes / (1024 * 1024 * 1024))
if bytes < 1024 * 1024 * 1024 * 1024 * 1024:
return ugettext("%.1f TB") % (bytes / (1024 * 1024 * 1024 * 1024))
return ugettext("%.1f PB") % (bytes / (1024 * 1024 * 1024 * 1024 * 1024))
filesizeformat.is_safe = True
def pluralize(value, arg=u's'):