aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/locale
diff options
context:
space:
mode:
authorBernardo de Pádua <berpasan@gmail.com>2010-03-20 17:37:38 -0300
committerJosé Valim <jose.valim@gmail.com>2010-03-22 21:19:49 +0100
commit75904c566e3ea475045450ba8fb1a74070a94fcb (patch)
tree764fbfd3732fa584dff7c40db1eba96c42a7d463 /actionpack/lib/action_view/locale
parente8a80cdded7d4a3ecf8d125681ab8bcae2b91504 (diff)
downloadrails-75904c566e3ea475045450ba8fb1a74070a94fcb.tar.gz
rails-75904c566e3ea475045450ba8fb1a74070a94fcb.tar.bz2
rails-75904c566e3ea475045450ba8fb1a74070a94fcb.zip
Adds number_to_human and several improvements in NumberHelper. [#4239 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view/locale')
-rw-r--r--actionpack/lib/action_view/locale/en.yml51
1 files changed, 45 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/locale/en.yml b/actionpack/lib/action_view/locale/en.yml
index a3548051c1..cfb4f7c390 100644
--- a/actionpack/lib/action_view/locale/en.yml
+++ b/actionpack/lib/action_view/locale/en.yml
@@ -9,6 +9,11 @@
delimiter: ","
# Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
precision: 3
+ # If set to true, precision will mean the number of significant digits instead
+ # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2)
+ significant: false
+ # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2)
+ strip_unsignificant_zeros: false
# Used in number_to_currency()
currency:
@@ -16,34 +21,43 @@
# Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
format: "%u%n"
unit: "$"
- # These three are to override number.format and are optional
+ # These five are to override number.format and are optional
separator: "."
delimiter: ","
precision: 2
+ significant: false
+ strip_unsignificant_zeros: false
# Used in number_to_percentage()
percentage:
format:
- # These three are to override number.format and are optional
+ # These five are to override number.format and are optional
# separator:
delimiter: ""
# precision:
+ # significant: false
+ # strip_unsignificant_zeros: false
# Used in number_to_precision()
precision:
format:
- # These three are to override number.format and are optional
+ # These five are to override number.format and are optional
# separator:
delimiter: ""
# precision:
+ # significant: false
+ # strip_unsignificant_zeros: false
- # Used in number_to_human_size()
+ # Used in number_to_human_size() and number_to_human()
human:
format:
- # These three are to override number.format and are optional
+ # These five are to override number.format and are optional
# separator:
delimiter: ""
- precision: 1
+ precision: 3
+ significant: true
+ strip_unsignificant_zeros: true
+ # Used in number_to_human_size()
storage_units:
# Storage units output formatting.
# %u is the storage unit, %n is the number (default: 2 MB)
@@ -56,6 +70,31 @@
mb: "MB"
gb: "GB"
tb: "TB"
+ # Used in number_to_human()
+ decimal_units:
+ format: "%n %u"
+ # Decimal units output formatting
+ # By default we will only quantify some of the exponents
+ # but the commented ones might be defined or overridden
+ # by the user.
+ units:
+ # femto: Quadrillionth
+ # pico: Trillionth
+ # nano: Billionth
+ # micro: Millionth
+ # mili: Thousandth
+ # centi: Hundredth
+ # deci: Tenth
+ unit: ""
+ # ten:
+ # one: Ten
+ # other: Tens
+ # hundred: Hundred
+ thousand: Thousand
+ million: Million
+ billion: Billion
+ trillion: Trillion
+ quadrillion: Quadrillion
# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
datetime: