diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2009-06-07 21:43:44 -0500 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2009-06-07 21:43:44 -0500 |
| commit | 71b1a4b39d08e401cf8a73d1a551c532da509fa7 (patch) | |
| tree | cfec0ae640ab9cf17a0d95e15a9b22186fafaf89 /activesupport | |
| parent | 184986067a3294cb178a9dd8955b934ff3feb9a0 (diff) | |
| download | rails-71b1a4b39d08e401cf8a73d1a551c532da509fa7.tar.gz rails-71b1a4b39d08e401cf8a73d1a551c532da509fa7.tar.bz2 rails-71b1a4b39d08e401cf8a73d1a551c532da509fa7.zip | |
Kathmandu TimeZone: reference Asia/Kathmandu zone directly instead of through linked timezone
Diffstat (limited to 'activesupport')
3 files changed, 21 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index b37dae1c2a..564528bfe2 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -125,7 +125,7 @@ module ActiveSupport "Kolkata" => "Asia/Kolkata", "Mumbai" => "Asia/Kolkata", "New Delhi" => "Asia/Kolkata", - "Kathmandu" => "Asia/Katmandu", + "Kathmandu" => "Asia/Kathmandu", "Astana" => "Asia/Dhaka", "Dhaka" => "Asia/Dhaka", "Sri Jayawardenepura" => "Asia/Colombo", diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kathmandu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kathmandu.rb new file mode 100644 index 0000000000..37b241612e --- /dev/null +++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kathmandu.rb @@ -0,0 +1,20 @@ +require 'tzinfo/timezone_definition' + +module TZInfo + module Definitions + module Asia + module Kathmandu + include TimezoneDefinition + + timezone 'Asia/Kathmandu' do |tz| + tz.offset :o0, 20476, 0, :LMT + tz.offset :o1, 19800, 0, :IST + tz.offset :o2, 20700, 0, :NPT + + tz.transition 1919, 12, :o1, 52322204081, 21600 + tz.transition 1985, 12, :o2, 504901800 + end + end + end + end +end diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Katmandu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Katmandu.rb deleted file mode 100644 index ac53f39242..0000000000 --- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Katmandu.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'tzinfo/timezone_definition' - -module TZInfo - module Definitions - module Asia - module Katmandu - include TimezoneDefinition - - linked_timezone 'Asia/Katmandu', 'Asia/Kathmandu' - end - end - end -end |