From 71b1a4b39d08e401cf8a73d1a551c532da509fa7 Mon Sep 17 00:00:00 2001
From: Geoff Buesing <gbuesing@gmail.com>
Date: Sun, 7 Jun 2009 21:43:44 -0500
Subject: Kathmandu TimeZone: reference Asia/Kathmandu zone directly instead of
 through linked timezone

---
 activesupport/lib/active_support/values/time_zone.rb |  2 +-
 .../tzinfo/definitions/Asia/Kathmandu.rb             | 20 ++++++++++++++++++++
 .../tzinfo/definitions/Asia/Katmandu.rb              | 13 -------------
 3 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Kathmandu.rb
 delete mode 100644 activesupport/lib/active_support/vendor/tzinfo-0.3.13/tzinfo/definitions/Asia/Katmandu.rb

(limited to 'activesupport')

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
-- 
cgit v1.2.3