From 85f66ea6d2291c77a937305457592e24c85425ae Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 26 Jun 2008 17:03:38 +0000 Subject: Number helper uses lang files Bytes use whole numbers (123.0 bytes is just silly) --- system/helpers/number_helper.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'system/helpers') diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php index 23ba3a1bb..8c9e384eb 100644 --- a/system/helpers/number_helper.php +++ b/system/helpers/number_helper.php @@ -38,30 +38,33 @@ if ( ! function_exists('byte_format')) { function byte_format($num) { + $CI =& get_instance(); + $CI->lang->load('number'); if ($num >= 1000000000000) { $num = round($num/1099511627776)/10; - $unit = 'TB'; + $unit = $CI->lang->line('terabyte_abbr'); } elseif ($num >= 1000000000) { $num = round($num/107374182)/10; - $unit = 'GB'; + $unit = $CI->lang->line('gigabyte_abbr'); } elseif ($num >= 1000000) { $num = round($num/104857)/10; - $unit = 'MB'; + $unit = $CI->lang->line('megabyte_abbr'); } elseif ($num >= 1000) { $num = round($num/102)/10; - $unit = 'KB'; + $unit = $CI->lang->line('kilobyte_abbr'); } else { - $unit = 'Bytes'; + $unit = $CI->lang->line('bytes'); + return number_format($num).' '.$unit; } return number_format($num, 1).' '.$unit; -- cgit v1.2.3-24-g4f1b