Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5b89473

Browse filesBrowse files
tglsfdctglsfdc
committed
Add CST (China Standard Time) to our lists of timezone abbreviations.
For some reason this seems to have been missed when the lists in src/timezone/tznames/ were first constructed. We can't put it in Default because of the conflict with US CST, but we should certainly list it among the alternative entries in Asia.txt. (I checked for other oversights, but all the other abbreviations that are in current use according to the IANA files seem to be accounted for.) Noted while responding to bug #12326.
1 parent 3f37b6c commit 5b89473
Copy full SHA for 5b89473

File tree

Expand file treeCollapse file tree

4 files changed

+13
-0
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+13
-0
lines changed

‎src/timezone/tznames/America.txt

Copy file name to clipboardExpand all lines: src/timezone/tznames/America.txt
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,13 @@ COT -18000 # Columbia Time (not in zic)
137137
# Other timezones:
138138
# - CST: Central Standard Time (Australia)
139139
# - CST: Central Standard Time (America)
140+
# - CST: China Standard Time (Asia)
140141
CST -18000 # Cuba Central Standard Time (America)
141142
# (America/Havana)
142143
# CONFLICT! CST is not unique
143144
# Other timezones:
144145
# - CST: Central Standard Time (Australia)
146+
# - CST: China Standard Time (Asia)
145147
# - CST: Cuba Central Standard Time (America)
146148
CST -21600 # Central Standard Time (America)
147149
# (America/Cancun)

‎src/timezone/tznames/Asia.txt

Copy file name to clipboardExpand all lines: src/timezone/tznames/Asia.txt
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ CHOST 36000 D # Choibalsan Summer Time (obsolete)
5959
CHOT Asia/Choibalsan # Choibalsan Time
6060
# (Asia/Choibalsan)
6161
CIT 28800 # Central Indonesia Time (obsolete, WITA is now preferred)
62+
# CONFLICT! CST is not unique
63+
# Other timezones:
64+
# - CST: Central Standard Time (Australia)
65+
# - CST: Central Standard Time (America)
66+
# - CST: Cuba Central Standard Time (America)
67+
CST 28800 # China Standard Time
68+
# (Asia/Macau)
69+
# (Asia/Shanghai)
70+
# (Asia/Taipei)
6271
EEST 10800 D # East-Egypt Summer Time
6372
# Eastern Europe Summer Time
6473
# (Africa/Cairo)

‎src/timezone/tznames/Australia.txt

Copy file name to clipboardExpand all lines: src/timezone/tznames/Australia.txt
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ CAST 34200 # Central Australia Standard Time (not in zic)
4141
# CONFLICT! CST is not unique
4242
# Other timezones:
4343
# - CST: Central Standard Time (America)
44+
# - CST: China Standard Time (Asia)
4445
# - CST: Cuba Central Standard Time (America)
4546
CST 34200 # Central Standard Time (not in zic)
4647
CWST 31500 # Central Western Standard Time (not in zic)

‎src/timezone/tznames/Default

Copy file name to clipboardExpand all lines: src/timezone/tznames/Default
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ CLT -14400 # Chile Time
105105
# CONFLICT! CST is not unique
106106
# Other timezones:
107107
# - CST: Central Standard Time (Australia)
108+
# - CST: China Standard Time (Asia)
108109
# - CST: Cuba Central Standard Time (America)
109110
CST -21600 # Central Standard Time (America)
110111
# (America/Cancun)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.