summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc16
1 files changed, 9 insertions, 7 deletions
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));
}
/**