From: Carlos Amedee <carlos@golang.org>
Date: Mon, 8 May 2023 15:17:59 +0000 (-0400)
Subject: time: update windows zoneinfo_abbrs
X-Git-Tag: go1.21rc1~538
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c12f53864bf3a7a0612ab7d20b45277fae7ea181;p=gostls13.git

time: update windows zoneinfo_abbrs

The primary branch of the github.com/unicode-org/cldr repository
has changed to main instead of master. This changes the branch used
to download the Windows zone file.

Ran:
go generate time

For #58113

Change-Id: Idb3dcaf44fc52d4b6abfed5a3ca6cd6f745dc3f8
Reviewed-on: https://go-review.googlesource.com/c/go/+/493477
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
Auto-Submit: Carlos Amedee <carlos@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Carlos Amedee <carlos@golang.org>
---

diff --git a/src/time/genzabbrs.go b/src/time/genzabbrs.go
index a8651bfdb8..7dbd22f4ea 100644
--- a/src/time/genzabbrs.go
+++ b/src/time/genzabbrs.go
@@ -53,7 +53,7 @@ type zone struct {
 	DSTime   string
 }
 
-const wzURL = "https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml"
+const wzURL = "https://raw.githubusercontent.com/unicode-org/cldr/main/common/supplemental/windowsZones.xml"
 
 type MapZone struct {
 	Other     string `xml:"other,attr"`
diff --git a/src/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go
index ab9880cfe9..27831743e9 100644
--- a/src/time/zoneinfo_abbrs_windows.go
+++ b/src/time/zoneinfo_abbrs_windows.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Code generated by genzabbrs.go; DO NOT EDIT.
-// Based on information from https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml
+// Based on information from https://raw.githubusercontent.com/unicode-org/cldr/main/common/supplemental/windowsZones.xml
 
 package time
 
@@ -13,7 +13,7 @@ type abbr struct {
 }
 
 var abbrs = map[string]abbr{
-	"Egypt Standard Time":             {"EET", "EET"},     // Africa/Cairo
+	"Egypt Standard Time":             {"EET", "EEST"},    // 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
@@ -136,7 +136,7 @@ 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":         {"+03", "+03"},     // Europe/Volgograd
+	"Volgograd Standard Time":         {"MSK", "MSK"},     // Europe/Volgograd
 	"Central European Standard Time":  {"CET", "CEST"},    // Europe/Warsaw
 	"Mauritius Standard Time":         {"+04", "+04"},     // Indian/Mauritius
 	"Samoa Standard Time":             {"+13", "+13"},     // Pacific/Apia