From 4d5203f4ffe923766592cb84db404040cff387e9 Mon Sep 17 00:00:00 2001 From: joeybloggs Date: Thu, 18 Aug 2016 09:27:45 -0400 Subject: Add timezone logic + locale specific info --- as/as.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'as/as.go') diff --git a/as/as.go b/as/as.go index 7725c1f2..eb31f042 100644 --- a/as/as.go +++ b/as/as.go @@ -42,6 +42,7 @@ type as struct { erasAbbreviated [][]byte erasNarrow [][]byte erasWide [][]byte + timezones map[string][]byte } // New returns a new instance of translator for the 'as' locale @@ -65,6 +66,7 @@ func New() locales.Translator { daysWide: [][]uint8{{0xe0, 0xa6, 0xa6, 0xe0, 0xa7, 0x87, 0xe0, 0xa6, 0x93, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}, {0xe0, 0xa6, 0xb8, 0xe0, 0xa7, 0x8b, 0xe0, 0xa6, 0xae, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}, {0xe0, 0xa6, 0xae, 0xe0, 0xa6, 0x99, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0x97, 0xe0, 0xa6, 0xb2, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}, {0xe0, 0xa6, 0xac, 0xe0, 0xa7, 0x81, 0xe0, 0xa6, 0xa7, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}, {0xe0, 0xa6, 0xac, 0xe0, 0xa7, 0x83, 0xe0, 0xa6, 0xb9, 0xe0, 0xa6, 0xb7, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xaa, 0xe0, 0xa6, 0xa4, 0xe0, 0xa6, 0xbf, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}, {0xe0, 0xa6, 0xb6, 0xe0, 0xa7, 0x81, 0xe0, 0xa6, 0x95, 0xe0, 0xa7, 0x8d, 0xe0, 0xa7, 0xb0, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}, {0xe0, 0xa6, 0xb6, 0xe0, 0xa6, 0xa8, 0xe0, 0xa6, 0xbf, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0}}, periodsAbbreviated: [][]uint8{{0xe0, 0xa6, 0xaa, 0xe0, 0xa7, 0x82, 0xe0, 0xa7, 0xb0, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa6, 0xb9, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xa3}, {0xe0, 0xa6, 0x85, 0xe0, 0xa6, 0xaa, 0xe0, 0xa7, 0xb0, 0xe0, 0xa6, 0xbe, 0xe0, 0xa6, 0xb9, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xa3}}, periodsWide: [][]uint8{{0xe0, 0xa6, 0xaa, 0xe0, 0xa7, 0x82, 0xe0, 0xa7, 0xb0, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xac, 0xe0, 0xa6, 0xbe, 0xe0, 0xa6, 0xb9, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xa3}, {0xe0, 0xa6, 0x85, 0xe0, 0xa6, 0xaa, 0xe0, 0xa7, 0xb0, 0xe0, 0xa6, 0xbe, 0xe0, 0xa6, 0xb9, 0xe0, 0xa7, 0x8d, 0xe0, 0xa6, 0xa3}}, + timezones: map[string][]uint8{"GYT": {0x47, 0x59, 0x54}, "EAT": {0x45, 0x41, 0x54}, "ACST": {0x41, 0x43, 0x53, 0x54}, "PDT": {0x50, 0x44, 0x54}, "SGT": {0x53, 0x47, 0x54}, "HADT": {0x48, 0x41, 0x44, 0x54}, "WITA": {0x57, 0x49, 0x54, 0x41}, "MYT": {0x4d, 0x59, 0x54}, "LHDT": {0x4c, 0x48, 0x44, 0x54}, "WARST": {0x57, 0x41, 0x52, 0x53, 0x54}, "ChST": {0x43, 0x68, 0x53, 0x54}, "MEZ": {0x4d, 0x45, 0x5a}, "MESZ": {0x4d, 0x45, 0x53, 0x5a}, "AEST": {0x41, 0x45, 0x53, 0x54}, "VET": {0x56, 0x45, 0x54}, "WEZ": {0x57, 0x45, 0x5a}, "WESZ": {0x57, 0x45, 0x53, 0x5a}, "COST": {0x43, 0x4f, 0x53, 0x54}, "CST": {0x43, 0x53, 0x54}, "HNT": {0x48, 0x4e, 0x54}, "CHADT": {0x43, 0x48, 0x41, 0x44, 0x54}, "HAT": {0x48, 0x41, 0x54}, "ADT": {0x41, 0x44, 0x54}, "WAT": {0x57, 0x41, 0x54}, "CLT": {0x43, 0x4c, 0x54}, "CHAST": {0x43, 0x48, 0x41, 0x53, 0x54}, "IST": {0xe0, 0xa6, 0xad, 0xe0, 0xa6, 0xbe, 0xe0, 0xa7, 0xb0, 0xe0, 0xa6, 0xa4, 0xe0, 0xa7, 0x80, 0xe0, 0xa6, 0xaf, 0xe0, 0xa6, 0xbc, 0x20, 0xe0, 0xa6, 0xb8, 0xe0, 0xa6, 0xae, 0xe0, 0xa6, 0xaf, 0xe0, 0xa6, 0xbc}, "AKDT": {0x41, 0x4b, 0x44, 0x54}, "ACWDT": {0x41, 0x43, 0x57, 0x44, 0x54}, "AEDT": {0x41, 0x45, 0x44, 0x54}, "AWST": {0x41, 0x57, 0x53, 0x54}, "TMST": {0x54, 0x4d, 0x53, 0x54}, "HKST": {0x48, 0x4b, 0x53, 0x54}, "OEZ": {0x4f, 0x45, 0x5a}, "OESZ": {0x4f, 0x45, 0x53, 0x5a}, "WIT": {0x57, 0x49, 0x54}, "GMT": {0x47, 0x4d, 0x54}, "ACDT": {0x41, 0x43, 0x44, 0x54}, "UYST": {0x55, 0x59, 0x53, 0x54}, "ART": {0x41, 0x52, 0x54}, "EDT": {0x45, 0x44, 0x54}, "WART": {0x57, 0x41, 0x52, 0x54}, "GFT": {0x47, 0x46, 0x54}, "BOT": {0x42, 0x4f, 0x54}, "CLST": {0x43, 0x4c, 0x53, 0x54}, "EST": {0x45, 0x53, 0x54}, "MDT": {0x4d, 0x44, 0x54}, "COT": {0x43, 0x4f, 0x54}, "CAT": {0x43, 0x41, 0x54}, "LHST": {0x4c, 0x48, 0x53, 0x54}, "WIB": {0x57, 0x49, 0x42}, "NZDT": {0x4e, 0x5a, 0x44, 0x54}, "HAST": {0x48, 0x41, 0x53, 0x54}, "UYT": {0x55, 0x59, 0x54}, "PST": {0x50, 0x53, 0x54}, "SAST": {0x53, 0x41, 0x53, 0x54}, "ECT": {0x45, 0x43, 0x54}, "SRT": {0x53, 0x52, 0x54}, "ARST": {0x41, 0x52, 0x53, 0x54}, "AWDT": {0x41, 0x57, 0x44, 0x54}, "MST": {0x4d, 0x53, 0x54}, "TMT": {0x54, 0x4d, 0x54}, "ACWST": {0x41, 0x43, 0x57, 0x53, 0x54}, "JST": {0x4a, 0x53, 0x54}, "AKST": {0x41, 0x4b, 0x53, 0x54}, "AST": {0x41, 0x53, 0x54}, "NZST": {0x4e, 0x5a, 0x53, 0x54}, "BT": {0x42, 0x54}, "CDT": {0x43, 0x44, 0x54}, "JDT": {0x4a, 0x44, 0x54}, "∅∅∅": {0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85}, "WAST": {0x57, 0x41, 0x53, 0x54}, "HKT": {0x48, 0x4b, 0x54}}, } } @@ -616,7 +618,11 @@ func (as *as) FmtTimeFull(t time.Time) []byte { b = append(b, []byte{0x20}...) tz, _ := t.Zone() - b = append(b, tz...) + if btz, ok := as.timezones[tz]; ok { + b = append(b, btz...) + } else { + b = append(b, tz...) + } return b } -- cgit v1.2.3