Merge branch 'iain' into i18n

3 files changed, 92 insertions, 90 deletions

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 7e9ae9432d..f13324a9d0 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -35,7 +35,7 @@ require 'action_view/partials'
 require 'action_view/template_error'
 
 I18n.backend.populate do
-  I18n.load_translations File.dirname(__FILE__) + '/action_view/locale/en-US.rb'
+  I18n.load_translations File.dirname(__FILE__) + '/action_view/locale/en-US.yml'
 end
 
 ActionView::Base.class_eval do
diff --git a/actionpack/lib/action_view/locale/en-US.rb b/actionpack/lib/action_view/locale/en-US.rb
deleted file mode 100644
index d4647b5a48..0000000000
--- a/actionpack/lib/action_view/locale/en-US.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-{ :'en-US' => {
-    :datetime => {
-      :distance_in_words => {
-        :half_a_minute => 'half a minute',
-        :less_than_x_seconds => {
-          :one => 'less than 1 second', 
-          :many => 'less than {{count}} seconds'
-        },
-        :x_seconds => {
-          :one => '1 second', 
-          :many => '{{count}} seconds'
-        },
-        :less_than_x_minutes => {
-          :one => 'less than a minute', 
-          :many => 'less than {{count}} minutes'
-        },
-        :x_minutes => {
-          :one => '1 minute', 
-          :many => '{{count}} minutes'
-        },
-        :about_x_hours => {
-          :one => 'about 1 hour', 
-          :many => 'about {{count}} hours'
-        },
-        :x_days => {
-          :one => '1 day',
-          :many => '{{count}} days' 
-        },
-        :about_x_months => { 
-          :one => 'about 1 month', 
-          :many => 'about {{count}} months'
-        },
-        :x_months => {
-          :one => '1 month', 
-          :many => '{{count}} months'
-        },
-        :about_x_years => {
-          :one => 'about 1 year', 
-          :many => 'about {{count}} years'
-        },
-        :over_x_years => {
-          :one => 'over 1 year', 
-          :many => 'over {{count}} years'
-        }
-      }
-    },
-    :number => {
-      :format => {
-        :precision => 3,
-        :separator => '.',
-        :delimiter => ','
-      },
-      :currency => {
-        :format => {
-          :unit => '$',
-          :precision => 2,
-          :format => '%u%n'
-        }
-      },
-      :human => {
-        :format => {
-          :precision => 1,
-          :delimiter => ''
-        }
-      },
-      :percentage => {
-        :format => {
-          :delimiter => ''
-        }
-      },
-      :precision => {
-        :format => {
-          :delimiter => ''
-        }
-      }
-    },
-    :activerecord => {
-      :errors => {
-        :template => {
-          :header => {
-            :one => "1 error prohibited this {{model}} from being saved", 
-            :many => "{{count}} errors prohibited this {{model}} from being saved"
-          },
-          :body => "There were problems with the following fields:"
-        }
-      }
-    }
-  }
-}
diff --git a/actionpack/lib/action_view/locale/en-US.yml b/actionpack/lib/action_view/locale/en-US.yml
new file mode 100644
index 0000000000..57987f4e02
--- /dev/null
+++ b/actionpack/lib/action_view/locale/en-US.yml
@@ -0,0 +1,91 @@
+"en-US":
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+      
+    # Used in number_to_currency()
+    currency:
+      format:
+        # 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
+        separator: "."
+        delimiter: ","
+        precision: 2
+        
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        # precision: 
+        
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        precision: 1
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "half a minute"
+      less_than_x_seconds:
+        one:  "less than 1 second"
+        many: "less than {{count}} seconds"
+      x_seconds:
+        one:  "1 second"
+        many: "{{count}} seconds"
+      less_than_x_minutes:
+        one:  "less than a minute"
+        many: "less than {{count}} minutes"
+      x_minutes:
+        one:  "1 minute"
+        many: "{{count}} minutes"
+      about_x_hours:
+        one:  "about 1 hour"
+        many: "about {{count}} hours"
+      x_days:
+        one:  "1 day"
+        many: "{{count}} days"
+      about_x_months:
+        one:  "about 1 month"
+        many: "about {{count}} months"
+      x_months:
+        one:  "1 month"
+        many: "{{count}} months"
+      about_x_years:
+        one:  "about 1 year"
+        many: "about {{count}} years"
+      over_x_years:
+        one:  "over 1 year"
+        many: "over {{count}} years"
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:   "1 error prohibited this {{model}} from being saved"
+          many:  "{{count}} errors prohibited this {{model}} from being saved"
+        # The variable :count is also available
+        body: "There were problems with the following fields:"
+