Skip to content
Browse files

Time#to_s(:rfc822) uses #formatted_offset instead of unreliable and n…

…on-standard %z directive [#1899 state:resolved]
  • Loading branch information...
1 parent 5c63be1 commit 73c91429a18d4b8f083b504dc0829f737f718d44 @zdzolton zdzolton committed with gbuesing Feb 9, 2009
View
2 activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -10,7 +10,7 @@ module Conversions
:short => "%d %b %H:%M",
:long => "%B %d, %Y %H:%M",
:long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") },
- :rfc822 => "%a, %d %b %Y %H:%M:%S %z"
+ :rfc822 => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
}
def self.included(base) #:nodoc:
View
4 activesupport/test/core_ext/time_ext_test.rb
@@ -461,6 +461,10 @@ def test_to_s
with_env_tz "UTC" do
assert_equal "Mon, 21 Feb 2005 17:44:30 +0000", time.to_s(:rfc822)
end
+ with_env_tz "US/Central" do
+ assert_equal "Thu, 05 Feb 2009 14:30:05 -0600", Time.local(2009, 2, 5, 14, 30, 5).to_s(:rfc822)
+ assert_equal "Mon, 09 Jun 2008 04:05:01 -0500", Time.local(2008, 6, 9, 4, 5, 1).to_s(:rfc822)
+ end
end
def test_custom_date_format

0 comments on commit 73c9142

Please sign in to comment.
Something went wrong with that request. Please try again.