diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-11-25 23:56:28 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-11-25 23:56:28 +0000 |
| commit | eacca8d7e6227d730918b829f022f2fb8592358c (patch) | |
| tree | 7cd0f210d4314b8b7e5ba838d0af6aa8c583ca34 | |
| parent | 619e5c29f45ccbe626adff654b3a6b0d9fa4ad1f (diff) | |
| download | rails-eacca8d7e6227d730918b829f022f2fb8592358c.tar.gz rails-eacca8d7e6227d730918b829f022f2fb8592358c.tar.bz2 rails-eacca8d7e6227d730918b829f022f2fb8592358c.zip | |
Added Time#to_s(:time) which will just return H:M, like 17:44 [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5628 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/time_ext_test.rb | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index a4f286b42f..b1747b3ed0 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added Time#to_s(:time) which will just return H:M, like 17:44 [DHH] + * Add Module#attr_accessor_with_default to initialize value of attribute before setting it. Closes #6538. [Stuart Halloway, Marcel Molina Jr.] * Hash#to_xml handles keys with the same name as Kernel methods. #6613 [Catfish] diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index c141d082e2..6e8dae21f1 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -8,6 +8,7 @@ module ActiveSupport #:nodoc: module Conversions DATE_FORMATS = { :db => "%Y-%m-%d %H:%M:%S", + :time => "%H:%M", :short => "%d %b %H:%M", :long => "%B %d, %Y %H:%M", :rfc822 => "%a, %d %b %Y %H:%M:%S %z" diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb index 657be1aecc..8d14be38c1 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -272,6 +272,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase time = Time.local(2005, 2, 21, 17, 44, 30) assert_equal "2005-02-21 17:44:30", time.to_s(:db) assert_equal "21 Feb 17:44", time.to_s(:short) + assert_equal "17:44", time.to_s(:time) assert_equal "February 21, 2005 17:44", time.to_s(:long) time = Time.utc(2005, 2, 21, 17, 44, 30) |