aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/values/time_zone.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-12-10 10:08:07 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-12-10 10:08:07 +0000
commitdc3e55d11759d2f423f3f76986ee6f8f219d53cc (patch)
tree18de9be2ab7a096e00bdeb66df473be873af6f1a /activesupport/lib/active_support/values/time_zone.rb
parentbcbcc0260b4f75e9da7f009dfc7e3e0233158274 (diff)
downloadrails-dc3e55d11759d2f423f3f76986ee6f8f219d53cc.tar.gz
rails-dc3e55d11759d2f423f3f76986ee6f8f219d53cc.tar.bz2
rails-dc3e55d11759d2f423f3f76986ee6f8f219d53cc.zip
TimeZone#to_s uses UTC rather than GMT. References #1689.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8370 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/values/time_zone.rb')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index cd4b84bdc7..b7df68fe33 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -68,7 +68,7 @@ class TimeZone
# Returns a textual representation of this time zone.
def to_s
- "(GMT#{formatted_offset}) #{name}"
+ "(UTC#{formatted_offset}) #{name}"
end
@@zones = nil