openstack/horizon
Code Issues Proposed changes

Merge "filesizeformat() does't consider the situation like float('inf')"

Browse Source
This commit is contained in:
Jenkins 2017-02-21 05:37:35 +00:00 committed by Gerrit Code Review
commit 22d907cb76
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
horizon/templatetags/sizeformat.py
View File

@ -51,6 +51,8 @@ def filesizeformat(bytes, filesize_number_format):
return ungettext_lazy("%(size)d Byte", return ungettext_lazy("%(size)d Byte",
"%(size)d Bytes", 0) % {'size': 0} "%(size)d Bytes", 0) % {'size': 0}
if bytes == float('inf'):
return _('Infinity')
if bytes < units.Ki: if bytes < units.Ki:
bytes = int(bytes) bytes = int(bytes)
return ungettext_lazy("%(size)d Byte", return ungettext_lazy("%(size)d Byte",
@ -63,7 +65,13 @@ def filesizeformat(bytes, filesize_number_format):
return _("%s GB") % filesize_number_format(bytes / units.Gi) return _("%s GB") % filesize_number_format(bytes / units.Gi)
if bytes < units.Pi: if bytes < units.Pi:
return _("%s TB") % filesize_number_format(bytes / units.Ti) return _("%s TB") % filesize_number_format(bytes / units.Ti)
return _("%s PB") % filesize_number_format(bytes / units.Pi) if bytes < units.Ei:
return _("%s PB") % filesize_number_format(bytes / units.Pi)
if bytes < units.Zi:
return _("%s EB") % filesize_number_format(bytes / units.Ei)
if bytes < units.Yi:
return _("%s ZB") % filesize_number_format(bytes / units.Zi)
return _("%s YB") % filesize_number_format(bytes / units.Yi)
def float_cast_filesizeformat(value, multiplier=1, format=int_format): def float_cast_filesizeformat(value, multiplier=1, format=int_format):