Changeset 8774

Timestamp:

02/02/08 02:59:10 (5 months ago)

Author:

bitsweat

Message:

Fix number_to_human_size incorrectly removing trailing zeros. Closes #10099 [libc, developingchris]

Files:

• trunk/actionpack/lib/action_view/helpers/number_helper.rb (modified) (1 diff)
• trunk/actionpack/test/template/number_helper_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_view/helpers/number_helper.rb

@@ -171 +171 @@
-          when size < 1.terabyte; "%.#{precision}f GB"  % (size / 1.0.gigabyte)
-          else                    "%.#{precision}f TB"  % (size / 1.0.terabyte)
-)\.?0+ /, '\1 ' 
+\.\d*?)0+ /, '\1 ' ).sub(/\. /,' '
-      rescue
-        nil

trunk/actionpack/test/template/number_helper_test.rb

@@ -88 +88 @@
-    assert_equal '10 KB',   number_to_human_size(10.000.kilobytes, 4)
-    assert_equal '1 Byte',   number_to_human_size(1.1)
+    assert_equal '10 Bytes', number_to_human_size(10)
-    assert_nil number_to_human_size('x')
-    assert_nil number_to_human_size(nil)