Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit3e51c15

Browse files
committed
Add the Brazilian time zone abbreviations BRT, BRST, FNT, FNST.
ACT and ACST were already present. AMT and AMST conflict with theexisting entries for Armenia; no change there for the moment.
1 parent412c57b commit3e51c15

File tree

2 files changed

+40
-29
lines changed

2 files changed

+40
-29
lines changed

‎doc/src/sgml/datetime.sgml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.32 2003/07/29 00:03:17 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.33 2003/08/25 23:30:25 tgl Exp $
33
-->
44

55
<appendix id="datetime-appendix">
@@ -536,18 +536,10 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.32 2003/07/29 00:03:17 tg
536536
<entry>+07:00</entry>
537537
<entry>Christmas (Island) Time</entry>
538538
</row>
539-
<!--
540-
Conflicts with China Coastal Time
541-
<row>
542-
<entry>CCT</entry>
543-
<entry>+06:30</entry>
544-
<entry>Cocos Island Time</entry>
545-
</row>
546-
-->
547539
<row>
548540
<entry>MMT</entry>
549541
<entry>+06:30</entry>
550-
<entry>Myannar Time</entry>
542+
<entry>Myanmar Time</entry>
551543
</row>
552544
<row>
553545
<entry>ALMT</entry>
@@ -759,6 +751,21 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.32 2003/07/29 00:03:17 tg
759751
<entry>-01:00</entry>
760752
<entry>West Africa Time</entry>
761753
</row>
754+
<row>
755+
<entry>FNST</entry>
756+
<entry>-01:00</entry>
757+
<entry>Fernando de Noronha Summer Time</entry>
758+
</row>
759+
<row>
760+
<entry>FNT</entry>
761+
<entry>-02:00</entry>
762+
<entry>Fernando de Noronha Time</entry>
763+
</row>
764+
<row>
765+
<entry>BRST</entry>
766+
<entry>-02:00</entry>
767+
<entry>Brasilia Summer Time</entry>
768+
</row>
762769
<row>
763770
<entry>NDT</entry>
764771
<entry>-02:30</entry>
@@ -774,6 +781,11 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.32 2003/07/29 00:03:17 tg
774781
<entry>-03:00</entry>
775782
<entry>(unknown)</entry>
776783
</row>
784+
<row>
785+
<entry>BRT</entry>
786+
<entry>-03:00</entry>
787+
<entry>Brasilia Time</entry>
788+
</row>
777789
<row>
778790
<entry>NFT</entry>
779791
<entry>-03:30</entry>
@@ -794,11 +806,6 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.32 2003/07/29 00:03:17 tg
794806
<entry>-04:00</entry>
795807
<entry>Atlantic/Porto Acre Summer Time</entry>
796808
</row>
797-
<row>
798-
<entry>ACT</entry>
799-
<entry>-05:00</entry>
800-
<entry>Atlantic/Porto Acre Standard Time</entry>
801-
</row>
802809
<row>
803810
<entry>EDT</entry>
804811
<entry>-04:00</entry>
@@ -811,6 +818,11 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.32 2003/07/29 00:03:17 tg
811818
<entry>GMT +4 hours</entry>
812819
</row>
813820
-->
821+
<row>
822+
<entry>ACT</entry>
823+
<entry>-05:00</entry>
824+
<entry>Atlantic/Porto Acre Standard Time</entry>
825+
</row>
814826
<row>
815827
<entry>CDT</entry>
816828
<entry>-05:00</entry>

‎src/backend/utils/adt/datetime.c

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.114 2003/08/2522:47:34 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.115 2003/08/2523:30:27 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -82,7 +82,7 @@ char *days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
8282
* which are 30 or 45 minutes away from an even hour, most are on an hour
8383
* boundary, and none on other boundaries.
8484
*
85-
* Let's include all strings from my currentzinc time zone database.
85+
* Let's include all strings from my currentzic time zone database.
8686
* Not all of them are unique, or even very understandable, so we will
8787
* leave some commented out for now.
8888
*/
@@ -91,8 +91,8 @@ static datetkn datetktbl[] = {
9191
{EARLY,RESERV,DTK_EARLY},/* "-infinity" reserved for "early time" */
9292
{"abstime",IGNORE_DTF,0},/* for pre-v6.1 "Invalid Abstime" */
9393
{"acsst",DTZ,POS(42)},/* Cent. Australia */
94-
{"acst",DTZ,NEG(16)},/* Atlantic/Porto Acre */
95-
{"act",TZ,NEG(20)},/* Atlantic/Porto Acre */
94+
{"acst",DTZ,NEG(16)},/* Atlantic/Porto AcreSummer Time*/
95+
{"act",TZ,NEG(20)},/* Atlantic/Porto AcreTime*/
9696
{DA_D,ADBC,AD},/* "ad" for years >= 0 */
9797
{"adt",DTZ,NEG(12)},/* Atlantic Daylight Time */
9898
{"aesst",DTZ,POS(44)},/* E. Australia */
@@ -107,9 +107,12 @@ static datetkn datetktbl[] = {
107107
{"am",AMPM,AM},
108108
{"amst",DTZ,POS(20)},/* Armenia Summer Time (Yerevan) */
109109
#if0
110-
{"amst",DTZ,NEG(12)},/* Porto Velho */
110+
{"amst",DTZ,NEG(12)},/*Amazon Summer Time (Porto Velho) */
111111
#endif
112112
{"amt",TZ,POS(16)},/* Armenia Time (Yerevan) */
113+
#if0
114+
{"amt",TZ,NEG(16)},/* Amazon Time (Porto Velho) */
115+
#endif
113116
{"anast",DTZ,POS(52)},/* Anadyr Summer Time (Russia) */
114117
{"anat",TZ,POS(48)},/* Anadyr Time (Russia) */
115118
{"apr",MONTH,4},
@@ -147,10 +150,8 @@ static datetkn datetktbl[] = {
147150
#endif
148151
{"bot",TZ,NEG(16)},/* Bolivia Time */
149152
{"bra",TZ,NEG(12)},/* Brazil Time */
150-
#if0
151-
brst
152-
brt
153-
#endif
153+
{"brst",DTZ,NEG(8)},/* Brasilia Summer Time */
154+
{"brt",TZ,NEG(12)},/* Brasilia Time */
154155
{"bst",DTZ,POS(4)},/* British Summer Time */
155156
#if0
156157
{"bst",TZ,NEG(12)},/* Brazil Standard Time */
@@ -226,10 +227,8 @@ static datetkn datetktbl[] = {
226227
{"fjt",TZ,NEG(48)},/* Fiji Time */
227228
{"fkst",DTZ,NEG(12)},/* Falkland Islands Summer Time */
228229
{"fkt",TZ,NEG(8)},/* Falkland Islands Time */
229-
#if0
230-
fnst
231-
fnt
232-
#endif
230+
{"fnst",DTZ,NEG(4)},/* Fernando de Noronha Summer Time */
231+
{"fnt",TZ,NEG(8)},/* Fernando de Noronha Time */
233232
{"fri",DOW,5},
234233
{"friday",DOW,5},
235234
{"fst",TZ,POS(4)},/* French Summer Time */
@@ -324,7 +323,7 @@ static datetkn datetktbl[] = {
324323
{"mez",TZ,POS(4)},/* Middle Europe Zone */
325324
{"mht",TZ,POS(48)},/* Kwajalein */
326325
{"mm",UNITS,DTK_MINUTE},/* "minute" for ISO input */
327-
{"mmt",TZ,POS(26)},/*Myannar Time */
326+
{"mmt",TZ,POS(26)},/*Myanmar Time */
328327
{"mon",DOW,1},
329328
{"monday",DOW,1},
330329
#if0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp