]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.19] time: update windows zoneinfo_abbrs
authorqmuntal <quimmuntal@gmail.com>
Fri, 27 Jan 2023 18:12:43 +0000 (19:12 +0100)
committerDavid Chase <drchase@google.com>
Thu, 9 Feb 2023 18:52:56 +0000 (18:52 +0000)
zoneinfo_abbrs hasn't been updated since go 1.14, it's time to
regenerate it.

Fixes #58118.

Change-Id: Ic156ae607c46f1f5a9408b1fc0b56de6c14a4ed4
Reviewed-on: https://go-review.googlesource.com/c/go/+/463838
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
Run-TryBot: Quim Muntal <quimmuntal@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
(cherry picked from commit 007d8f4db1f890f0d34018bb418bdc90ad4a8c35)
Reviewed-on: https://go-review.googlesource.com/c/go/+/466555
TryBot-Bypass: David Chase <drchase@google.com>
Run-TryBot: David Chase <drchase@google.com>
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
Reviewed-by: Than McIntosh <thanm@google.com>
src/time/zoneinfo_abbrs_windows.go

index 3294d0d78689bc990805dade50976a0a773e428e..139bda1accea95b855d83b101405753b657e3f23 100644 (file)
@@ -16,10 +16,11 @@ var abbrs = map[string]abbr{
        "Egypt Standard Time":             {"EET", "EET"},     // Africa/Cairo
        "Morocco Standard Time":           {"+00", "+01"},     // Africa/Casablanca
        "South Africa Standard Time":      {"SAST", "SAST"},   // Africa/Johannesburg
+       "South Sudan Standard Time":       {"CAT", "CAT"},     // Africa/Juba
        "Sudan Standard Time":             {"CAT", "CAT"},     // Africa/Khartoum
        "W. Central Africa Standard Time": {"WAT", "WAT"},     // Africa/Lagos
        "E. Africa Standard Time":         {"EAT", "EAT"},     // Africa/Nairobi
-       "Sao Tome Standard Time":          {"GMT", "WAT"},     // Africa/Sao_Tome
+       "Sao Tome Standard Time":          {"GMT", "GMT"},     // Africa/Sao_Tome
        "Libya Standard Time":             {"EET", "EET"},     // Africa/Tripoli
        "Namibia Standard Time":           {"CAT", "CAT"},     // Africa/Windhoek
        "Aleutian Standard Time":          {"HST", "HDT"},     // America/Adak
@@ -33,8 +34,8 @@ var abbrs = map[string]abbr{
        "Venezuela Standard Time":         {"-04", "-04"},     // America/Caracas
        "SA Eastern Standard Time":        {"-03", "-03"},     // America/Cayenne
        "Central Standard Time":           {"CST", "CDT"},     // America/Chicago
-       "Mountain Standard Time (Mexico)": {"MST", "MDT"},     // America/Chihuahua
-       "Central Brazilian Standard Time": {"-04", "-03"},     // America/Cuiaba
+       "Mountain Standard Time (Mexico)": {"CST", "CST"},     // America/Chihuahua
+       "Central Brazilian Standard Time": {"-04", "-04"},     // America/Cuiaba
        "Mountain Standard Time":          {"MST", "MDT"},     // America/Denver
        "Greenland Standard Time":         {"-03", "-02"},     // America/Godthab
        "Turks And Caicos Standard Time":  {"EST", "EDT"},     // America/Grand_Turk
@@ -44,7 +45,7 @@ var abbrs = map[string]abbr{
        "US Eastern Standard Time":        {"EST", "EDT"},     // America/Indianapolis
        "SA Western Standard Time":        {"-04", "-04"},     // America/La_Paz
        "Pacific Standard Time":           {"PST", "PDT"},     // America/Los_Angeles
-       "Central Standard Time (Mexico)":  {"CST", "CDT"},     // America/Mexico_City
+       "Central Standard Time (Mexico)":  {"CST", "CST"},     // America/Mexico_City
        "Saint Pierre Standard Time":      {"-03", "-02"},     // America/Miquelon
        "Montevideo Standard Time":        {"-03", "-03"},     // America/Montevideo
        "Eastern Standard Time":           {"EST", "EDT"},     // America/New_York
@@ -53,11 +54,12 @@ var abbrs = map[string]abbr{
        "Magallanes Standard Time":        {"-03", "-03"},     // America/Punta_Arenas
        "Canada Central Standard Time":    {"CST", "CST"},     // America/Regina
        "Pacific SA Standard Time":        {"-04", "-03"},     // America/Santiago
-       "E. South America Standard Time":  {"-03", "-02"},     // America/Sao_Paulo
+       "E. South America Standard Time":  {"-03", "-03"},     // America/Sao_Paulo
        "Newfoundland Standard Time":      {"NST", "NDT"},     // America/St_Johns
        "Pacific Standard Time (Mexico)":  {"PST", "PDT"},     // America/Tijuana
+       "Yukon Standard Time":             {"MST", "MST"},     // America/Whitehorse
        "Central Asia Standard Time":      {"+06", "+06"},     // Asia/Almaty
-       "Jordan Standard Time":            {"EET", "EEST"},    // Asia/Amman
+       "Jordan Standard Time":            {"+03", "+03"},     // Asia/Amman
        "Arabic Standard Time":            {"+03", "+03"},     // Asia/Baghdad
        "Azerbaijan Standard Time":        {"+04", "+04"},     // Asia/Baku
        "SE Asia Standard Time":           {"+07", "+07"},     // Asia/Bangkok
@@ -66,7 +68,7 @@ var abbrs = map[string]abbr{
        "India Standard Time":             {"IST", "IST"},     // Asia/Calcutta
        "Transbaikal Standard Time":       {"+09", "+09"},     // Asia/Chita
        "Sri Lanka Standard Time":         {"+0530", "+0530"}, // Asia/Colombo
-       "Syria Standard Time":             {"EET", "EEST"},    // Asia/Damascus
+       "Syria Standard Time":             {"+03", "+03"},     // Asia/Damascus
        "Bangladesh Standard Time":        {"+06", "+06"},     // Asia/Dhaka
        "Arabian Standard Time":           {"+04", "+04"},     // Asia/Dubai
        "West Bank Standard Time":         {"EET", "EEST"},    // Asia/Hebron
@@ -82,7 +84,7 @@ var abbrs = map[string]abbr{
        "N. Central Asia Standard Time":   {"+07", "+07"},     // Asia/Novosibirsk
        "Omsk Standard Time":              {"+06", "+06"},     // Asia/Omsk
        "North Korea Standard Time":       {"KST", "KST"},     // Asia/Pyongyang
-       "Qyzylorda Standard Time":         {"+05", "+06"},     // Asia/Qyzylorda
+       "Qyzylorda Standard Time":         {"+05", "+05"},     // Asia/Qyzylorda
        "Myanmar Standard Time":           {"+0630", "+0630"}, // Asia/Rangoon
        "Arab Standard Time":              {"+03", "+03"},     // Asia/Riyadh
        "Sakhalin Standard Time":          {"+11", "+11"},     // Asia/Sakhalin
@@ -93,7 +95,7 @@ var abbrs = map[string]abbr{
        "Taipei Standard Time":            {"CST", "CST"},     // Asia/Taipei
        "West Asia Standard Time":         {"+05", "+05"},     // Asia/Tashkent
        "Georgian Standard Time":          {"+04", "+04"},     // Asia/Tbilisi
-       "Iran Standard Time":              {"+0330", "+0430"}, // Asia/Tehran
+       "Iran Standard Time":              {"+0330", "+0330"}, // Asia/Tehran
        "Tokyo Standard Time":             {"JST", "JST"},     // Asia/Tokyo
        "Tomsk Standard Time":             {"+07", "+07"},     // Asia/Tomsk
        "Ulaanbaatar Standard Time":       {"+08", "+08"},     // Asia/Ulaanbaatar
@@ -112,7 +114,6 @@ var abbrs = map[string]abbr{
        "Lord Howe Standard Time":         {"+1030", "+11"},   // Australia/Lord_Howe
        "W. Australia Standard Time":      {"AWST", "AWST"},   // Australia/Perth
        "AUS Eastern Standard Time":       {"AEST", "AEDT"},   // Australia/Sydney
-       "UTC":                             {"GMT", "GMT"},     // Etc/GMT
        "UTC-11":                          {"-11", "-11"},     // Etc/GMT+11
        "Dateline Standard Time":          {"-12", "-12"},     // Etc/GMT+12
        "UTC-02":                          {"-02", "-02"},     // Etc/GMT+2
@@ -120,6 +121,7 @@ var abbrs = map[string]abbr{
        "UTC-09":                          {"-09", "-09"},     // Etc/GMT+9
        "UTC+12":                          {"+12", "+12"},     // Etc/GMT-12
        "UTC+13":                          {"+13", "+13"},     // Etc/GMT-13
+       "UTC":                             {"UTC", "UTC"},     // Etc/UTC
        "Astrakhan Standard Time":         {"+04", "+04"},     // Europe/Astrakhan
        "W. Europe Standard Time":         {"CET", "CEST"},    // Europe/Berlin
        "GTB Standard Time":               {"EET", "EEST"},    // Europe/Bucharest
@@ -134,20 +136,20 @@ var abbrs = map[string]abbr{
        "Romance Standard Time":           {"CET", "CEST"},    // Europe/Paris
        "Russia Time Zone 3":              {"+04", "+04"},     // Europe/Samara
        "Saratov Standard Time":           {"+04", "+04"},     // Europe/Saratov
-       "Volgograd Standard Time":         {"+04", "+04"},     // Europe/Volgograd
+       "Volgograd Standard Time":         {"+03", "+03"},     // Europe/Volgograd
        "Central European Standard Time":  {"CET", "CEST"},    // Europe/Warsaw
        "Mauritius Standard Time":         {"+04", "+04"},     // Indian/Mauritius
-       "Samoa Standard Time":             {"+13", "+14"},     // Pacific/Apia
+       "Samoa Standard Time":             {"+13", "+13"},     // Pacific/Apia
        "New Zealand Standard Time":       {"NZST", "NZDT"},   // Pacific/Auckland
        "Bougainville Standard Time":      {"+11", "+11"},     // Pacific/Bougainville
        "Chatham Islands Standard Time":   {"+1245", "+1345"}, // Pacific/Chatham
        "Easter Island Standard Time":     {"-06", "-05"},     // Pacific/Easter
-       "Fiji Standard Time":              {"+12", "+13"},     // Pacific/Fiji
+       "Fiji Standard Time":              {"+12", "+12"},     // Pacific/Fiji
        "Central Pacific Standard Time":   {"+11", "+11"},     // Pacific/Guadalcanal
        "Hawaiian Standard Time":          {"HST", "HST"},     // Pacific/Honolulu
        "Line Islands Standard Time":      {"+14", "+14"},     // Pacific/Kiritimati
        "Marquesas Standard Time":         {"-0930", "-0930"}, // Pacific/Marquesas
-       "Norfolk Standard Time":           {"+11", "+11"},     // Pacific/Norfolk
+       "Norfolk Standard Time":           {"+11", "+12"},     // Pacific/Norfolk
        "West Pacific Standard Time":      {"+10", "+10"},     // Pacific/Port_Moresby
        "Tonga Standard Time":             {"+13", "+13"},     // Pacific/Tongatapu
 }