From 7403c825a05af320e20f1b7e20b0c565081ede89 Mon Sep 17 00:00:00 2001
From: Luca Guidi <guidi.luca@gmail.com>
Date: Wed, 2 Jul 2008 17:51:34 +0200
Subject: Fixed Date and Time localization for ActiveSupport

---
 activesupport/lib/active_support/locale/en-US.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/locale/en-US.rb b/activesupport/lib/active_support/locale/en-US.rb
index aa06fe14bd..51324a90bf 100644
--- a/activesupport/lib/active_support/locale/en-US.rb
+++ b/activesupport/lib/active_support/locale/en-US.rb
@@ -3,5 +3,26 @@ I18n.backend.store_translations :'en-US', {
     :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
-- 
cgit v1.2.3