Merge branch 'iain' into i18n

2 files changed, 31 insertions, 29 deletions

diff --git a/activesupport/lib/active_support/locale/en-US.rb b/activesupport/lib/active_support/locale/en-US.rb
deleted file mode 100644
index ed457d6f4f..0000000000
--- a/activesupport/lib/active_support/locale/en-US.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-{ :'en-US' => {
-    :support => {
-      :array => {
-        :sentence_connector => 'and'
-      }
-    },
-    :date => {
-      :formats => {
-        :default => "%Y-%m-%d",
-        :short => "%b %d",
-        :long => "%B %d, %Y",
-      },
-      :day_names => Date::DAYNAMES,
-      :abbr_day_names => Date::ABBR_DAYNAMES,
-      :month_names => Date::MONTHNAMES,
-      :abbr_month_names => Date::ABBR_MONTHNAMES,
-      :order => [:year, :month, :day]
-    },
-    :time => {
-      :formats => {
-        :default => "%a, %d %b %Y %H:%M:%S %z",
-        :short => "%d %b %H:%M",
-        :long => "%B %d, %Y %H:%M",
-      },
-      :am => 'am',
-      :pm => 'pm'
-    }
-  }
-}
\ No newline at end of file
diff --git a/activesupport/lib/active_support/locale/en-US.yml b/activesupport/lib/active_support/locale/en-US.yml
new file mode 100644
index 0000000000..60ecb1d42a
--- /dev/null
+++ b/activesupport/lib/active_support/locale/en-US.yml
@@ -0,0 +1,31 @@
+en-US:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
+      
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+      
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+    # Used in date_select and datime_select.
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%B %d, %Y %H:%M"
+    am: "am"
+    pm: "pm"
+      
+# Used in array.to_sentence.
+  support:
+    array:
+      sentence_connector: "and"