From f1c869288166fd3f935393a9cfc3fddd52cd0bdc Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Sat, 30 Dec 2006 21:33:04 +0000
Subject: #101757 by ChrisKennedy. 1 byte instead of 1 bytes.

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

(limited to 'includes/common.inc')

diff --git a/includes/common.inc b/includes/common.inc
index 730804458..4a29f12e5 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -989,16 +989,18 @@ function parse_size($size) {
  *   A translated string representation of the size.
  */
 function format_size($size) {
-  $suffix = t('bytes');
-  if ($size >= 1024) {
-    $size = round($size / 1024, 2);
-    $suffix = t('KB');
+  if ($size < 1024) {
+    return format_plural($size, '1 byte', '@count bytes');
   }
-  if ($size >= 1024) {
+  else {
     $size = round($size / 1024, 2);
-    $suffix = t('MB');
+    $suffix = t('KB');
+    if ($size >= 1024) {
+      $size = round($size / 1024, 2);
+      $suffix = t('MB');
+    }
+    return t('@size @suffix', array('@size' => $size, '@suffix' => $suffix));
   }
-  return t('@size @suffix', array('@size' => $size, '@suffix' => $suffix));
 }
 
 /**
-- 
cgit v1.2.3