diff options
| author | Luca Guidi <guidi.luca@gmail.com> | 2008-07-02 17:51:34 +0200 |
|---|---|---|
| committer | Luca Guidi <guidi.luca@gmail.com> | 2008-07-02 17:51:34 +0200 |
| commit | 7403c825a05af320e20f1b7e20b0c565081ede89 (patch) | |
| tree | 0eb9771193aba8534d40e16dfd68830ce612a08f /activesupport/lib | |
| parent | 6982acb0793fb6e59f52cab4062344a88e3691ce (diff) | |
| download | rails-7403c825a05af320e20f1b7e20b0c565081ede89.tar.gz rails-7403c825a05af320e20f1b7e20b0c565081ede89.tar.bz2 rails-7403c825a05af320e20f1b7e20b0c565081ede89.zip | |
Fixed Date and Time localization for ActiveSupport
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/locale/en-US.rb | 21 |
1 files changed, 21 insertions, 0 deletions
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 |