integ/python/python-django/centos/patches/size-number-format.patch
Scott Little bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 10:06:31 -04:00

26 lines
1.2 KiB
Diff

diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index cd2457d..dc10ea3 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -905,15 +905,15 @@ def filesizeformat(bytes):
if bytes < KB:
value = ungettext("%(size)d byte", "%(size)d bytes", bytes) % {'size': bytes}
elif bytes < MB:
- value = ugettext("%s KB") % filesize_number_format(bytes / KB)
+ value = ugettext("%s KiB") % filesize_number_format(bytes / KB)
elif bytes < GB:
- value = ugettext("%s MB") % filesize_number_format(bytes / MB)
+ value = ugettext("%s MiB") % filesize_number_format(bytes / MB)
elif bytes < TB:
- value = ugettext("%s GB") % filesize_number_format(bytes / GB)
+ value = ugettext("%s GiB") % filesize_number_format(bytes / GB)
elif bytes < PB:
- value = ugettext("%s TB") % filesize_number_format(bytes / TB)
+ value = ugettext("%s TiB") % filesize_number_format(bytes / TB)
else:
- value = ugettext("%s PB") % filesize_number_format(bytes / PB)
+ value = ugettext("%s PiB") % filesize_number_format(bytes / PB)
return avoid_wrapping(value)