aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorHiro Asari <asari.ruby@gmail.com>2013-03-09 21:08:20 -0500
committerHiro Asari <asari.ruby@gmail.com>2013-04-12 11:28:12 -0400
commitdf3bda2c517b13e6f346c9204ec2e9422c77ae7f (patch)
tree4f5b8271e45390228388ab0640f41accde175c30 /activesupport
parent1c2f80a66f55e9ba84d7f3848aca47478f212949 (diff)
downloadrails-df3bda2c517b13e6f346c9204ec2e9422c77ae7f.tar.gz
rails-df3bda2c517b13e6f346c9204ec2e9422c77ae7f.tar.bz2
rails-df3bda2c517b13e6f346c9204ec2e9422c77ae7f.zip
Add Chatham Islands Time (UTC+1245) support.
Also update the documentation on the number of supported time zones.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 21a0620c22..3cf82a24b9 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -5,7 +5,7 @@ module ActiveSupport
# The TimeZone class serves as a wrapper around TZInfo::Timezone instances.
# It allows us to do the following:
#
- # * Limit the set of zones provided by TZInfo to a meaningful subset of 142
+ # * Limit the set of zones provided by TZInfo to a meaningful subset of 146
# zones.
# * Retrieve and display zones with a friendlier name
# (e.g., "Eastern Time (US & Canada)" instead of "America/New_York").
@@ -177,6 +177,7 @@ module ActiveSupport
"Wellington" => "Pacific/Auckland",
"Nuku'alofa" => "Pacific/Tongatapu",
"Tokelau Is." => "Pacific/Fakaofo",
+ "Chatham Is." => "Pacific/Chatham",
"Samoa" => "Pacific/Apia"
}