kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #7703 from kennyj/fix_6962 

Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
This commit is contained in:
Rafael Mendonça França 2012-09-20 06:34:55 -07:00
parent 2068d30091 105cb3d9e3
commit 883fa8f938
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activesupport/lib/active_support/time_with_zone.rb
View File

@ -168,7 +168,10 @@ module ActiveSupport
# Replaces <tt>%Z</tt> and <tt>%z</tt> directives with +zone+ and +formatted_offset+, respectively, before passing to
# Time#strftime, so that zone information is correct
def strftime(format)
format = format.gsub('%Z', zone).gsub('%z', formatted_offset(false))
format = format.gsub('%Z', zone)
.gsub('%z', formatted_offset(false))
.gsub('%:z', formatted_offset(true))
.gsub('%::z', formatted_offset(true) + ":00")
time.strftime(format)
end

8
activesupport/test/time_zone_test.rb
View File

@ -258,6 +258,14 @@ class TimeZoneTest < ActiveSupport::TestCase
assert_equal "-0500", zone.formatted_offset(false)
end
def test_z_format_strings
zone = ActiveSupport::TimeZone['Tokyo']
twz = zone.now
assert_equal '+0900', twz.strftime('%z')
assert_equal '+09:00', twz.strftime('%:z')
assert_equal '+09:00:00', twz.strftime('%::z')
end
def test_formatted_offset_zero
zone = ActiveSupport::TimeZone['London']
assert_equal "+00:00", zone.formatted_offset