aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2008-09-10 13:32:10 -0600
committerJamis Buck <jamis@37signals.com>2008-09-10 13:32:10 -0600
commit5bbca48c227044a05e5c685249801d4230d7dd08 (patch)
tree5f626375fe73abaf6a7191ec735d7bf1ac26dd71
parentc19c0e7872e65094b14bc08e24d19eebd9d1562a (diff)
downloadrails-5bbca48c227044a05e5c685249801d4230d7dd08.tar.gz
rails-5bbca48c227044a05e5c685249801d4230d7dd08.tar.bz2
rails-5bbca48c227044a05e5c685249801d4230d7dd08.zip
Fix Sri Jayawardenepura time zone to map to Asia/Colombo
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index b38a5061d5..7d7a6920e2 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*Edge*
+* Fixed Sri Jayawardenepura time zone to map to Asia/Colombo [Jamis Buck]
+
* Added Inflector#parameterize for easy slug generation ("Donald E. Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby]
* Changed cache benchmarking to be reported in milliseconds [DHH]
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 788d40bfa8..a294dd0ba3 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -124,7 +124,7 @@ module ActiveSupport
"Kathmandu" => "Asia/Katmandu",
"Astana" => "Asia/Dhaka",
"Dhaka" => "Asia/Dhaka",
- "Sri Jayawardenepura" => "Asia/Dhaka",
+ "Sri Jayawardenepura" => "Asia/Colombo",
"Almaty" => "Asia/Almaty",
"Novosibirsk" => "Asia/Novosibirsk",
"Rangoon" => "Asia/Rangoon",