Update intl tzdata

2019-07-08 13:09:38 +03:00 · 2019-07-08 13:09:38 +03:00 · a88dad9fed
parent eac38e37cc
commit a88dad9fed
25 changed files with 1027 additions and 1003 deletions
--- a/intl/tzdata/GIT-INFO
+++ b/intl/tzdata/GIT-INFO
@ -0,0 +1,5 @@
+commit a1dd3c5661404aa93924e737aeb86acf130b8889
+Author: yumaoka <y.umaoka@gmail.com>
+Date:   Tue Mar 26 19:02:10 2019 -0400
+
+    ICU-20522 tzdata2019a updates
--- a/intl/tzdata/SVN-INFO
+++ b/intl/tzdata/SVN-INFO
@ -1,10 +0,0 @@
-Path: 44
-URL: https://ssl.icu-project.org/repos/icu/data/trunk/tzdata/icunew/2018e/44
-Relative URL: ^/data/trunk/tzdata/icunew/2018e/44
-Repository Root: https://ssl.icu-project.org/repos/icu
-Repository UUID: 251d0590-4201-4cf1-90de-194747b24ca1
-Node Kind: directory
-Last Changed Author: yoshito
-Last Changed Rev: 41324
-Last Changed Date: 2018-05-04 22:02:44 +0000 (Fr, 04 Mai 2018)
-
--- a/intl/tzdata/VERSION
+++ b/intl/tzdata/VERSION
@ -0,0 +1 @@
+2019a
--- a/intl/tzdata/source/be/metaZones.res
+++ b/intl/tzdata/source/be/metaZones.res
--- a/intl/tzdata/source/be/timezoneTypes.res
+++ b/intl/tzdata/source/be/timezoneTypes.res
--- a/intl/tzdata/source/be/windowsZones.res
+++ b/intl/tzdata/source/be/windowsZones.res
--- a/intl/tzdata/source/be/zoneinfo64.res
+++ b/intl/tzdata/source/be/zoneinfo64.res
--- a/intl/tzdata/source/ee/metaZones.res
+++ b/intl/tzdata/source/ee/metaZones.res
--- a/intl/tzdata/source/ee/timezoneTypes.res
+++ b/intl/tzdata/source/ee/timezoneTypes.res
--- a/intl/tzdata/source/ee/windowsZones.res
+++ b/intl/tzdata/source/ee/windowsZones.res
--- a/intl/tzdata/source/ee/zoneinfo64.res
+++ b/intl/tzdata/source/ee/zoneinfo64.res
--- a/intl/tzdata/source/le/metaZones.res
+++ b/intl/tzdata/source/le/metaZones.res
--- a/intl/tzdata/source/le/timezoneTypes.res
+++ b/intl/tzdata/source/le/timezoneTypes.res
--- a/intl/tzdata/source/le/windowsZones.res
+++ b/intl/tzdata/source/le/windowsZones.res
--- a/intl/tzdata/source/le/zoneinfo64.res
+++ b/intl/tzdata/source/le/zoneinfo64.res
--- a/intl/tzdata/source/metaZones.txt
+++ b/intl/tzdata/source/metaZones.txt
@ -813,7 +813,7 @@ metaZones:table(nofallback){
            {
                "Europe_Western",
                "1985-12-31 23:00",
-                "9999-12-31 23:59",
+                "2018-10-28 02:00",
            }
        }
        "Africa:Ceuta"{
@ -862,7 +862,7 @@ metaZones:table(nofallback){
            {
                "Europe_Western",
                "1976-04-14 01:00",
-                "9999-12-31 23:59",
+                "2018-10-28 02:00",
            }
        }
        "Africa:Freetown"{
@ -1035,6 +1035,11 @@ metaZones:table(nofallback){
            {
                "Africa_Western",
                "2018-01-01 01:00",
+                "2019-01-01 01:00",
+            }
+            {
+                "GMT",
+                "2019-01-01 01:00",
                "9999-12-31 23:59",
            }
        }
@ -2076,6 +2081,16 @@ metaZones:table(nofallback){
            {
                "Alaska",
                "2015-11-01 10:00",
+                "2018-11-04 10:00",
+            }
+            {
+                "America_Pacific",
+                "2018-11-04 10:00",
+                "2019-01-20 10:00",
+            }
+            {
+                "Alaska",
+                "2019-01-20 10:00",
                "9999-12-31 23:59",
            }
        }
@ -2559,7 +2574,7 @@ metaZones:table(nofallback){
            {
                "Casey",
                "2016-10-21 16:00",
-                "2016-03-10 17:00",
+                "2018-03-10 17:00",
            }
            {
                "Australia_Western",
@ -3132,11 +3147,11 @@ metaZones:table(nofallback){
            {
                "Pyongyang",
                "2015-08-14 15:00",
-                "2018-05-05 08:30",
+                "2018-05-04 15:00",
            }
            {
                "Korea",
-                "2018-05-05 08:30",
+                "2018-05-04 15:00",
                "9999-12-31 23:59",
            }
        }
@ -3152,6 +3167,13 @@ metaZones:table(nofallback){
                "9999-12-31 23:59",
            }
        }
+        "Asia:Qostanay"{
+            {
+                "Kazakhstan_Eastern",
+                "2004-10-30 21:00",
+                "9999-12-31 23:59",
+            }
+        }
        "Asia:Qyzylorda"{
            {
                "Kizilorda",
@ -3166,6 +3188,11 @@ metaZones:table(nofallback){
            {
                "Kazakhstan_Eastern",
                "2004-10-30 21:00",
+                "2018-12-20 18:00",
+            }
+            {
+                "Kazakhstan_Western",
+                "2018-12-20 18:00",
                "9999-12-31 23:59",
            }
        }
@ -3992,6 +4019,11 @@ metaZones:table(nofallback){
            {
                "Moscow",
                "1992-03-28 22:00",
+                "2018-10-27 23:00",
+            }
+            {
+                "Volgograd",
+                "2018-10-27 23:00",
                "9999-12-31 23:59",
            }
        }
@ -4211,11 +4243,11 @@ metaZones:table(nofallback){
            {
                "Kwajalein",
                "1970-01-01 00:00",
-                "1993-08-20 12:00",
+                "1993-08-21 12:00",
            }
            {
                "Marshall_Islands",
-                "1993-08-20 12:00",
+                "1993-08-21 12:00",
                "9999-12-31 23:59",
            }
        }
--- a/intl/tzdata/source/timezoneTypes.txt
+++ b/intl/tzdata/source/timezoneTypes.txt
@ -416,6 +416,7 @@ timezoneTypes:table(nofallback){
            "Asia:Pontianak"{"idpnk"}
            "Asia:Pyongyang"{"kpfnj"}
            "Asia:Qatar"{"qadoh"}
+            "Asia:Qostanay"{"kzksn"}
            "Asia:Qyzylorda"{"kzkzo"}
            "Asia:Rangoon"{"mmrgn"}
            "Asia:Riyadh"{"saruh"}
--- a/intl/tzdata/source/windowsZones.txt
+++ b/intl/tzdata/source/windowsZones.txt
@ -17,8 +17,8 @@ windowsZones:table(nofallback){
        "Alaskan Standard Time"{
            001{"America/Anchorage"}
            US{
-                "America/Anchorage America/Juneau America/Metlakatla America/Nome Ame"
-                "rica/Sitka America/Yakutat"
+                "America/Anchorage America/Juneau America/Nome America/Sitka America/"
+                "Yakutat"
            }
        }
        "Aleutian Standard Time"{
@ -130,7 +130,7 @@ windowsZones:table(nofallback){
            CN{"Asia/Urumqi"}
            IO{"Indian/Chagos"}
            KG{"Asia/Bishkek"}
-            KZ{"Asia/Almaty Asia/Qyzylorda"}
+            KZ{"Asia/Almaty Asia/Qostanay"}
            ZZ{"Etc/GMT-6"}
        }
        "Central Brazilian Standard Time"{
@ -287,7 +287,7 @@ windowsZones:table(nofallback){
        }
        "GTB Standard Time"{
            001{"Europe/Bucharest"}
-            CY{"Asia/Nicosia"}
+            CY{"Asia/Famagusta Asia/Nicosia"}
            GR{"Europe/Athens"}
            RO{"Europe/Bucharest"}
        }
@ -468,7 +468,7 @@ windowsZones:table(nofallback){
        "Pacific Standard Time"{
            001{"America/Los_Angeles"}
            CA{"America/Vancouver America/Dawson America/Whitehorse"}
-            US{"America/Los_Angeles"}
+            US{"America/Los_Angeles America/Metlakatla"}
            ZZ{"PST8PDT"}
        }
        "Pakistan Standard Time"{
@ -580,6 +580,10 @@ windowsZones:table(nofallback){
            001{"Pacific/Apia"}
            WS{"Pacific/Apia"}
        }
+        "Sao Tome Standard Time"{
+            001{"Africa/Sao_Tome"}
+            ST{"Africa/Sao_Tome"}
+        }
        "Saratov Standard Time"{
            001{"Europe/Saratov"}
            RU{"Europe/Saratov"}
@ -654,7 +658,6 @@ windowsZones:table(nofallback){
        }
        "Turkey Standard Time"{
            001{"Europe/Istanbul"}
-            CY{"Asia/Famagusta"}
            TR{"Europe/Istanbul"}
        }
        "Turks And Caicos Standard Time"{
@ -746,7 +749,6 @@ windowsZones:table(nofallback){
            GQ{"Africa/Malabo"}
            NE{"Africa/Niamey"}
            NG{"Africa/Lagos"}
-            ST{"Africa/Sao_Tome"}
            TD{"Africa/Ndjamena"}
            TN{"Africa/Tunis"}
            ZZ{"Etc/GMT-1"}
@ -777,7 +779,7 @@ windowsZones:table(nofallback){
        "West Asia Standard Time"{
            001{"Asia/Tashkent"}
            AQ{"Antarctica/Mawson"}
-            KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau"}
+            KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qyzylorda"}
            MV{"Indian/Maldives"}
            TF{"Indian/Kerguelen"}
            TJ{"Asia/Dushanbe"}
--- a/intl/tzdata/source/zoneinfo64.txt
+++ b/intl/tzdata/source/zoneinfo64.txt
--- a/intl/update-tzdata.sh
+++ b/intl/update-tzdata.sh
@ -8,18 +8,20 @@ set -e
 # Usage: update-tzdata.sh <tzdata version>
 # E.g., for tzdata2016f: update-tzdata.sh 2016f

-# Ensure that $Date$ in the checked-out svn files expands timezone-agnostically,
+# Ensure that $Date$ in the checked-out git files expands timezone-agnostically,
 # so that this script's behavior is consistent when run from any time zone.
 export TZ=UTC

-# Also ensure SVN-INFO isn't localized.
-export LANG=C
+# Also ensure GIT-INFO is consistently English.
+export LANG=en_US.UTF-8
+export LANGUAGE=en_US
+export LC_ALL=en_US.UTF-8

 # Path to icupkg executable, typically located at $ICU_DIR/bin/icupkg.
 icu_pkg=
 # Force updates even when current tzdata is newer than the requested version.
 force=false
-# Dry run, doesn't run 'svn export' and 'icupkg'.
+# Dry run, doesn't run 'git clone' and 'icupkg'.
 dry=false
 # Compare ICU and local tzdata versions (used by update-icu.sh).
 check_version=false
@ -49,11 +51,11 @@ icudata_dir=`dirname "$0"`/../config/external/icu/data
 icu_dir=`dirname "$0"`/icu
 tzdata_dir=`dirname "$0"`/tzdata
 tzdata_files="${tzdata_dir}"/files.txt
-tzdata_url=https://ssl.icu-project.org/repos/icu/data/trunk/tzdata/icunew/${tzdata_version}/44/
+tzdata_url=https://github.com/unicode-org/icu-data.git
 icu_tzdata_version=`grep --only-matching --perl-regexp --regexp="tz version:\s+\K.*$" "${icu_dir}"/source/data/misc/zoneinfo64.txt`
 local_tzdata_version=
-if [ -f "${tzdata_dir}"/SVN-INFO ]; then
-  local_tzdata_version=`grep --only-matching --perl-regexp --regexp="^URL: .*tzdata/icunew/\K[0-9a-z]+" "${tzdata_dir}"/SVN-INFO`
+if [ -f "${tzdata_dir}"/VERSION ]; then
+  local_tzdata_version=`grep --only-matching --perl-regexp --regexp="^\K[0-9a-z]+" "${tzdata_dir}"/VERSION`
 fi

 # Check ICU and current local tzdata versions.
@ -118,20 +120,21 @@ else
  echo "INFO: ICU data file (big endian) not found, skipping..."
 fi

-# Retrieve tzdata from svn.
+# Retrieve tzdata from git.
 if [ $dry = false ]; then
  echo "INFO: Downloading tzdata${tzdata_version}"

  # Remove intl/tzdata/source, then replace it with a clean export.
  rm -r "${tzdata_dir}"/source
-  svn export "${tzdata_url}" "${tzdata_dir}"/source
-fi
+  git clone --depth 1 "${tzdata_url}" "${tzdata_dir}"/source
+  git -C "${tzdata_dir}"/source filter-branch --prune-empty --subdirectory-filter tzdata/icunew/${tzdata_version}/44 HEAD

-# Record `svn info`, eliding the line that changes every time the entire ICU
-# tzdata repository (not just the path within it we care about) receives a
-# commit.
-if [ $dry = false ]; then
-  svn info "${tzdata_url}" | grep --invert-match '^Revision: [[:digit:]]\+$' > "${tzdata_dir}"/SVN-INFO
+  # Record `git log` and the tzdata version.
+  git -C "${tzdata_dir}"/source log -1 > "${tzdata_dir}"/GIT-INFO
+  echo "${tzdata_version}" > "${tzdata_dir}"/VERSION
+
+  # Remove the .git directory.
+  rm -rf "${tzdata_dir}"/source/.git
 fi

 # Update ICU data.
@ -161,11 +164,6 @@ if [ $dry = false ]; then
    update_icu_data "be" "${icudata_file_be}"
  fi

-  hg addremove "${tzdata_dir}" "${icudata_file_le}"
-  if [ -n "${icudata_file_be}" ]; then
-    hg addremove "${icudata_file_be}"
-  fi
-
  echo "INFO: Successfully updated tzdata!"
-  echo "INFO: Please run js/src/builtin/make_intl_data.py to update additional time zone files for SpiderMonkey."
+  echo "INFO: Please run js/src/builtin/intl/make_intl_data.py to update additional time zone files for SpiderMonkey."
 fi
--- a/js/src/builtin/IntlTimeZoneData.h
+++ b/js/src/builtin/IntlTimeZoneData.h
@ -1,5 +1,5 @@
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2018e
+// tzdata version = 2019a

 #ifndef builtin_IntlTimeZoneData_h
 #define builtin_IntlTimeZoneData_h
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_backward_links.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_backward_links.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2018e
+// tzdata version = 2019a

 const tzMapper = [
    x => x,
@ -67,6 +67,7 @@ const links = {
    "Cuba": "America/Havana",
    "Egypt": "Africa/Cairo",
    "Eire": "Europe/Dublin",
+    "Etc/UCT": "Etc/UTC",
    "GB": "Europe/London",
    "GB-Eire": "Europe/London",
    "GMT+0": "Etc/GMT",
@ -98,7 +99,7 @@ const links = {
    "ROK": "Asia/Seoul",
    "Singapore": "Asia/Singapore",
    "Turkey": "Europe/Istanbul",
-    "UCT": "Etc/UCT",
+    "UCT": "Etc/UTC",
    "US/Alaska": "America/Anchorage",
    "US/Aleutian": "America/Adak",
    "US/Arizona": "America/Phoenix",
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_backzone.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_backzone.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2018e
+// tzdata version = 2019a

 const tzMapper = [
    x => x,
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_backzone_links.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_backzone_links.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2018e
+// tzdata version = 2019a

 const tzMapper = [
    x => x,
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_notbackward_links.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_notbackward_links.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2018e
+// tzdata version = 2019a

 const tzMapper = [
    x => x,