TimeZone#to_s uses UTC rather than GMT; reapplying change that was undone in [8679]. References #1689
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8716 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
8f7232bc76
commit
2168178bdb
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* TimeZone#to_s uses UTC rather than GMT; reapplying change that was undone in [8679]. #1689 [Cheah Chu Yeow]
|
||||
|
||||
* Time.days_in_month defaults to current year if no year is supplied as argument #10799 [Radar], uses Date.gregorian_leap? to determine leap year, and uses constant lookup to determine days in month [Geoff Buesing]
|
||||
|
||||
* Adding Time and DateTime #compare_with_coercion, which layers behavior on #<=> so that any combination of Time, DateTime and ActiveSupport::TimeWithZone instances can be chronologically compared [Geoff Buesing]
|
||||
|
|
|
@ -171,7 +171,7 @@ class TimeZone
|
|||
|
||||
# Returns a textual representation of this time zone.
|
||||
def to_s
|
||||
"(GMT#{formatted_offset}) #{name}"
|
||||
"(UTC#{formatted_offset}) #{name}"
|
||||
end
|
||||
|
||||
begin # the following methods depend on the tzinfo gem
|
||||
|
|
|
@ -95,7 +95,7 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_to_s
|
||||
assert_equal "(GMT+03:00) Moscow", TimeZone['Moscow'].to_s
|
||||
assert_equal "(UTC+03:00) Moscow", TimeZone['Moscow'].to_s
|
||||
end
|
||||
|
||||
def test_all_sorted
|
||||
|
|
Loading…
Reference in New Issue