mirror of
https://github.com/golang/go
synced 2024-11-23 16:20:04 -07:00
time: fix test error in Chinese edition of Windows
On the Chinese Windows XP system that I'm using, GetTimeZoneInformation returns a struct containing "中国标准时间" (China Standard Time in Chinese) in both StandardName and DaylightName (which is correct, because China does not use DST). However, in registry, under key HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time, the key Std and Dlt contain "中国标准时间" (China Standard Time in Chinese) and "中国夏季时间" (China Summer Time in Chinese) respectively. This means that time.toEnglishName() cannot determine the abbreviation for the local timezone (CST) and causes test failures (time.Local is empty) R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/43210043
This commit is contained in:
parent
4a18e0edd9
commit
98f16ad112
@ -54,7 +54,7 @@ func matchZoneKey(zones syscall.Handle, kname string, stdname, dstname string) (
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if s != dstname {
|
||||
if s != dstname && dstname != stdname {
|
||||
return false, nil
|
||||
}
|
||||
return true, nil
|
||||
|
Loading…
Reference in New Issue
Block a user