Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7fe3083

Browse files
committed
Ensure that distributed timezone abbreviation files are plain ASCII.
We had two occurrences of "Mitteleuropäische Zeit" in Europe.txt, though the corresponding entries in Default were spelled "Mitteleuropaeische Zeit". Standardize on the latter spelling to avoid questions of which encoding to use. While here, correct a couple of other trivial inconsistencies between the Default file and the supposedly-matching entries in the *.txt files, as exposed by some checking with comm(1). Also, add BDST to the Europe.txt file; it previously was only listed in Default. None of this has any direct functional effect. Per complaint from Christoph Berg. As usual for timezone data patches, apply to all branches. Discussion: https://postgr.es/m/20200716100743.GE3534683@msg.df7cb.de
1 parent 20ef355 commit 7fe3083

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

src/timezone/tznames/Antarctica.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AWST 28800 # Australian Western Standard Time
1313
CLST -10800 D # Chile Summer Time (obsolete)
1414
CLT America/Santiago # Chile Time (obsolete)
1515
DAVT Antarctica/Davis # Davis Time (Antarctica) (obsolete)
16-
DDUT 36000 # Dumont-d`Urville Time (Antarctica) (obsolete)
16+
DDUT 36000 # Dumont-d'Urville Time (Antarctica) (obsolete)
1717
MAWT Antarctica/Mawson # Mawson Time (Antarctica) (obsolete)
1818
MIST 39600 # Macquarie Island Time (obsolete)
1919
NZDT 46800 D # New Zealand Daylight Time

src/timezone/tznames/Australia.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# src/timezone/tznames/Australia.txt
88
#
99

10-
ACSST 37800 D # Central Australia (not in IANA database)
10+
ACSST 37800 D # Australian Central Summer Standard Time (not in IANA database)
1111
ACDT 37800 D # Australian Central Daylight Time
1212
# (Australia/Adelaide)
1313
# (Australia/Broken_Hill)
@@ -17,7 +17,7 @@ ACST 34200 # Australian Central Standard Time
1717
# (Australia/Broken_Hill)
1818
# (Australia/Darwin)
1919
ACWST 31500 # Australian Central Western Standard Time (obsolete)
20-
AESST 39600 D # Australia Eastern Summer Standard Time (not in IANA database)
20+
AESST 39600 D # Australian Eastern Summer Standard Time (not in IANA database)
2121
AEDT 39600 D # Australian Eastern Daylight Time
2222
# (Australia/Brisbane)
2323
# (Australia/Currie)

src/timezone/tznames/Default

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ CHUT 36000 # Chuuk Time (obsolete)
597597
CKT Pacific/Rarotonga # Cook Islands Time (obsolete)
598598
EASST Pacific/Easter # Easter Island Summer Time (obsolete)
599599
EAST Pacific/Easter # Easter Island Time (Chile) (obsolete)
600-
FJST 46800 D # Fiji Summer Time (obsolete)
601-
FJT 43200 # Fiji Time (obsolete)
600+
FJST 46800 D # Fiji Summer Time (caution: this used to mean -46800) (obsolete)
601+
FJT 43200 # Fiji Time (caution: this used to mean -43200) (obsolete)
602602
GALT -21600 # Galapagos Time (obsolete)
603603
GAMT -32400 # Gambier Time (obsolete)
604604
GILT 43200 # Gilbert Islands Time (obsolete)

src/timezone/tznames/Europe.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# - BST: Bougainville Standard Time (Papua New Guinea)
1313
BST 3600 D # British Summer Time
1414
# (Europe/London)
15+
BDST 7200 D # British Double Summer Time
1516
CEST 7200 D # Central Europe Summer Time
1617
# (Africa/Ceuta)
1718
# (Europe/Amsterdam)
@@ -184,12 +185,12 @@ IST 3600 # Irish Standard Time
184185
# (Europe/Dublin)
185186
MEST 7200 D # Middle Europe Summer Time
186187
# (MET)
187-
MESZ 7200 D # Mitteleurop�ische Sommerzeit (German)
188+
MESZ 7200 D # Mitteleuropaeische Sommerzeit (German)
188189
# (attested in IANA comments though not their code)
189190
MET 3600 # Middle Europe Time
190191
# (MET)
191192
METDST 7200 D # Middle Europe Summer Time (not in IANA database)
192-
MEZ 3600 # Mitteleurop�ische Zeit (German)
193+
MEZ 3600 # Mitteleuropaeische Zeit (German)
193194
# (attested in IANA comments though not their code)
194195
MSD 14400 D # Moscow Daylight Time (obsolete)
195196
MSK Europe/Moscow # Moscow Time

0 commit comments

Comments
 (0)