From ecb032a239f88ead2087aa98cbcf28522a523922 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 9 Jun 2008 08:11:45 +0000
Subject: - Patch #151902 by MadHarold et al: a better format_size() (and
 removed some excessive white space).

---
 includes/common.inc | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'includes/common.inc')

diff --git a/includes/common.inc b/includes/common.inc
index bdf3d1867..883371ff4 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1079,17 +1079,21 @@ function parse_size($size) {
  *   A translated string representation of the size.
  */
 function format_size($size, $langcode = NULL) {
-  if ($size < 1024) {
+  if ($size < 1000) {
     return format_plural($size, '1 byte', '@count bytes', array(), $langcode);
   }
   else {
-    $size = round($size / 1024, 2);
-    $suffix = t('KB', array(), $langcode);
-    if ($size >= 1024) {
-      $size = round($size / 1024, 2);
-      $suffix = t('MB', array(), $langcode);
+    $size = $size / 1000; // convert bytes to kilobytes (1000 bytes)
+    $units = array('KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+    foreach ($units as $suffix) {
+      if (round($size, 2) >= 1000) {
+        $size = $size / 1000;
+      }
+      else {
+        break;
+      }
     }
-    return t('@size @suffix', array('@size' => $size, '@suffix' => $suffix), $langcode);
+    return t('@size @suffix', array('@size' => round($size, 2), '@suffix' => $suffix), $langcode);
   }
 }
 
-- 
cgit v1.2.3