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.

diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index 9e6273207c10007dc9726614579ea38d9d78e939..1bb636741b46fd9a52affe6570ae32e65fe0c8b1 100644 (file)
--- a/src/timezone/tznames/America.txt
+++ b/src/timezone/tznames/America.txt
@@ -137,11 +137,13 @@ COT    -18000    # Columbia Time (not in zic)
 # Other timezones:
 #  - CST: Central Standard Time (Australia)
 #  - CST: Central Standard Time (America)
+#  - CST: China Standard Time (Asia)
 CST    -18000    # Cuba Central Standard Time (America)
                  #     (America/Havana)
 # CONFLICT! CST is not unique
 # Other timezones:
 #  - CST: Central Standard Time (Australia)
+#  - CST: China Standard Time (Asia)
 #  - CST: Cuba Central Standard Time (America)
 CST    -21600    # Central Standard Time (America)
                  #     (America/Cancun)

diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index bb28646429792ca6e6afaf24263cab6aea79d50c..dcca78af7b0c82aced32957e6b828e8ca2d4fe7f 100644 (file)
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -59,6 +59,15 @@ CHOST   36000 D  # Choibalsan Summer Time (obsolete)
 CHOT    Asia/Choibalsan  # Choibalsan Time
                  #     (Asia/Choibalsan)
 CIT     28800    # Central Indonesia Time (obsolete, WITA is now preferred)
+# CONFLICT! CST is not unique
+# Other timezones:
+#  - CST: Central Standard Time (Australia)
+#  - CST: Central Standard Time (America)
+#  - CST: Cuba Central Standard Time (America)
+CST     28800    # China Standard Time
+                 #     (Asia/Macau)
+                 #     (Asia/Shanghai)
+                 #     (Asia/Taipei)
 EEST    10800 D  # East-Egypt Summer Time
                  # Eastern Europe Summer Time
                  #     (Africa/Cairo)

diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt
index 92c296840f9b2a84a077d5ca9f6b074d88d8d915..8f1c1379c1d6021fcbb0445807ce3db29f58399b 100644 (file)
--- a/src/timezone/tznames/Australia.txt
+++ b/src/timezone/tznames/Australia.txt
@@ -41,6 +41,7 @@ CAST    34200    # Central Australia Standard Time (not in zic)
 # CONFLICT! CST is not unique
 # Other timezones:
 #  - CST: Central Standard Time (America)
+#  - CST: China Standard Time (Asia)
 #  - CST: Cuba Central Standard Time (America)
 CST     34200    # Central Standard Time (not in zic)
 CWST    31500    # Central Western Standard Time (not in zic)

diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index fca7ff8daa182c8c17c453302dfa4db46d825dbc..7a58e5900e5814a107c3d842d16706d11184553a 100644 (file)
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -105,6 +105,7 @@ CLT    -14400    # Chile Time
 # CONFLICT! CST is not unique
 # Other timezones:
 #  - CST: Central Standard Time (Australia)
+#  - CST: China Standard Time (Asia)
 #  - CST: Cuba Central Standard Time (America)
 CST    -21600    # Central Standard Time (America)
                  #     (America/Cancun)