TimezoneParser 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18789091be6be2c439379c82e6942ec61fcf6134
-  data.tar.gz: 51125b6160160c75006e86174656bf2b6dcf7877
+  metadata.gz: 0cd2f7add9bd7865eabb212a3eb738681ceab43c
+  data.tar.gz: 9db1c17a8894110d2e6fcde60077ff30296a39a6
 SHA512:
-  metadata.gz: c6b429795532b59a6ac5b91ef501d70b98d22813e74a3942ecaab2ae021976f3efe33440b1ea5499845d0288bb99ab5e8c11d43a965f5808d6bde84000ad2dd8
-  data.tar.gz: 5018193aad38c2b479089eb95a217644f6cbe6846fe049b7de080edc6f91fec1acd6ad355c45dfaea645682ca90d6e12ac492da2bc4ae3a65967c621e1c696d1
+  metadata.gz: b2973864779926a11b8ddcb63cbedba4d78a315692257c0e11f6596a35b83e3ea947cb07ae29dbf7fae0101f1200497752e55b7e089f37a9466fba6cf8e79834
+  data.tar.gz: cee3e66b241e26837b60b5dd39b4a38b528f0994186cf7fb1c6a407f35fa9fd27dc9fe4269cf7824c308b48602a35b4aba9feaabce9b04ac56fc4612aae3392a

data/Rakefile

@@ -98,7 +98,7 @@ def update_windows_mui
         tzres = data_location + 'windows_tzres.yaml'
         require 'timezone_parser/data/windows'
         offsets = YAML.load_file(tzres)
-	offsets.merge!(TimezoneParser::Windows.getMUIOffsets)
+        offsets.merge!(TimezoneParser::Windows.getMUIOffsets)
         write_yaml(tzres, offsets)
     else
         puts 'Can update Windows tzres MUI offsets only from Windows!'
@@ -111,6 +111,9 @@ def update_windows_mui_extended(metazones, locales)
     offsets.merge!(TimezoneParser::Windows.collectMUIOffsets(metazones, locales))
     write_yaml(tzres, offsets)
     update_windows_mui
+    offsets = YAML.load_file(tzres)
+    TimezoneParser::Windows.correctMUIOffsetNames(offsets, metazones, locales)
+    write_yaml(tzres, offsets)
 end
 
 def import_timezones

data/data/windows_tzres.yaml

@@ -1561,13 +1561,13 @@
   Name: Libya Standard Time
 1820:
   Type: display
-  Name: Russia TZ 1 Standard Time
+  Name: Kaliningrad Standard Time
 1830:
   Type: display
-  Name: Russia TZ 2 Standard Time
+  Name: Russian Standard Time
 1840:
   Type: display
-  Name: Russia TZ 4 Standard Time
+  Name: Ekaterinburg Standard Time
 1850:
   Type: display
   Name: Russia TZ 5 Standard Time
@@ -1579,22 +1579,22 @@
   Name: Russia TZ 5 Standard Time
 1860:
   Type: display
-  Name: Russia TZ 6 Standard Time
+  Name: North Asia Standard Time
 1870:
   Type: display
-  Name: Russia TZ 7 Standard Time
+  Name: North Asia East Standard Time
 1880:
   Type: display
-  Name: Russia TZ 8 Standard Time
+  Name: Yakutsk Standard Time
 1890:
   Type: display
-  Name: Russia TZ 3 Standard Time
+  Name: Russia Time Zone 3
 1910:
   Type: display
-  Name: Russia TZ 10 Standard Time
+  Name: Russia Time Zone 10
 1930:
   Type: display
-  Name: Russia TZ 11 Standard Time
+  Name: Russia Time Zone 11
 1950:
   Type: display
-  Name: Russia TZ 9 Standard Time
+  Name: Vladivostok Standard Time

data/lib/timezone_parser/data/windows.rb

@@ -114,6 +114,22 @@ module TimezoneParser
                 data['Name'] = baseMetazone[(id / 10) * 10 + type_base + types.index('standard')]
                 offsets[id] = data unless data['Name'].nil?
             end
+            Hash[offsets.to_a.sort_by { |o| o.first }]
+        end
+
+        def self.correctMUIOffsetNames(offsets, metazoneList, locales)
+            enUS = locales.key('en-US')
+            baseMetazone = metazoneList[enUS]
+            offsets.each do |id, data|
+                actualMetazone = nil
+                baseMetazone.each do |zoneid, name|
+                    if id != zoneid and name == data['Name']
+                        actualMetazone = offsets[zoneid]['Name']
+                        break
+                    end
+                end
+                data['Name'] = actualMetazone if actualMetazone
+            end
             offsets
         end
 

data/lib/timezone_parser/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module TimezoneParser
     # Version
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TimezoneParser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo