Add FmtDateTime helper functions.

1 files changed, 61 insertions, 1 deletions

diff --git a/nd/nd.go b/nd/nd.go
index ca423a05..a1d51140 100644
--- a/nd/nd.go
+++ b/nd/nd.go
@@ -69,7 +69,7 @@ func New() locales.Translator {
 		erasAbbreviated:        [][]uint8{{0x42, 0x43}, {0x41, 0x44}},
 		erasNarrow:             [][]uint8{[]uint8(nil), []uint8(nil)},
 		erasWide:               [][]uint8{{0x55, 0x4b, 0x72, 0x69, 0x73, 0x74, 0x6f, 0x20, 0x61, 0x6e, 0x67, 0x61, 0x6b, 0x61, 0x62, 0x75, 0x79, 0x69}, {0x55, 0x6b, 0x72, 0x69, 0x73, 0x74, 0x6f, 0x20, 0x65, 0x62, 0x75, 0x79, 0x69, 0x6c, 0x65}},
-		timezones:              map[string][]uint8{"ECT": {0x45, 0x43, 0x54}, "EAT": {0x45, 0x41, 0x54}, "GMT": {0x47, 0x4d, 0x54}, "UYST": {0x55, 0x59, 0x53, 0x54}, "HKST": {0x48, 0x4b, 0x53, 0x54}, "MYT": {0x4d, 0x59, 0x54}, "AEDT": {0x41, 0x45, 0x44, 0x54}, "COST": {0x43, 0x4f, 0x53, 0x54}, "CAT": {0x43, 0x41, 0x54}, "EST": {0x45, 0x53, 0x54}, "SGT": {0x53, 0x47, 0x54}, "VET": {0x56, 0x45, 0x54}, "AKST": {0x41, 0x4b, 0x53, 0x54}, "ADT": {0x41, 0x44, 0x54}, "MESZ": {0x4d, 0x45, 0x53, 0x5a}, "ACWDT": {0x41, 0x43, 0x57, 0x44, 0x54}, "WESZ": {0x57, 0x45, 0x53, 0x5a}, "AST": {0x41, 0x53, 0x54}, "SRT": {0x53, 0x52, 0x54}, "CLST": {0x43, 0x4c, 0x53, 0x54}, "IST": {0x49, 0x53, 0x54}, "ACDT": {0x41, 0x43, 0x44, 0x54}, "ARST": {0x41, 0x52, 0x53, 0x54}, "COT": {0x43, 0x4f, 0x54}, "CST": {0x43, 0x53, 0x54}, "OESZ": {0x4f, 0x45, 0x53, 0x5a}, "AWST": {0x41, 0x57, 0x53, 0x54}, "WAST": {0x57, 0x41, 0x53, 0x54}, "WITA": {0x57, 0x49, 0x54, 0x41}, "MST": {0x4d, 0x53, 0x54}, "LHDT": {0x4c, 0x48, 0x44, 0x54}, "HAT": {0x48, 0x41, 0x54}, "AKDT": {0x41, 0x4b, 0x44, 0x54}, "BOT": {0x42, 0x4f, 0x54}, "LHST": {0x4c, 0x48, 0x53, 0x54}, "CLT": {0x43, 0x4c, 0x54}, "∅∅∅": {0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85}, "TMST": {0x54, 0x4d, 0x53, 0x54}, "ChST": {0x43, 0x68, 0x53, 0x54}, "EDT": {0x45, 0x44, 0x54}, "CHADT": {0x43, 0x48, 0x41, 0x44, 0x54}, "PST": {0x50, 0x53, 0x54}, "WART": {0x57, 0x41, 0x52, 0x54}, "AEST": {0x41, 0x45, 0x53, 0x54}, "HAST": {0x48, 0x41, 0x53, 0x54}, "GFT": {0x47, 0x46, 0x54}, "WIB": {0x57, 0x49, 0x42}, "CHAST": {0x43, 0x48, 0x41, 0x53, 0x54}, "JDT": {0x4a, 0x44, 0x54}, "ACST": {0x41, 0x43, 0x53, 0x54}, "PDT": {0x50, 0x44, 0x54}, "OEZ": {0x4f, 0x45, 0x5a}, "NZDT": {0x4e, 0x5a, 0x44, 0x54}, "ART": {0x41, 0x52, 0x54}, "CDT": {0x43, 0x44, 0x54}, "WIT": {0x57, 0x49, 0x54}, "AWDT": {0x41, 0x57, 0x44, 0x54}, "HNT": {0x48, 0x4e, 0x54}, "WEZ": {0x57, 0x45, 0x5a}, "NZST": {0x4e, 0x5a, 0x53, 0x54}, "WARST": {0x57, 0x41, 0x52, 0x53, 0x54}, "MDT": {0x4d, 0x44, 0x54}, "GYT": {0x47, 0x59, 0x54}, "TMT": {0x54, 0x4d, 0x54}, "MEZ": {0x4d, 0x45, 0x5a}, "HADT": {0x48, 0x41, 0x44, 0x54}, "UYT": {0x55, 0x59, 0x54}, "JST": {0x4a, 0x53, 0x54}, "BT": {0x42, 0x54}, "ACWST": {0x41, 0x43, 0x57, 0x53, 0x54}, "HKT": {0x48, 0x4b, 0x54}, "WAT": {0x57, 0x41, 0x54}, "SAST": {0x53, 0x41, 0x53, 0x54}},
+		timezones:              map[string][]uint8{"MST": {0x4d, 0x53, 0x54}, "ACWST": {0x41, 0x43, 0x57, 0x53, 0x54}, "ACDT": {0x41, 0x43, 0x44, 0x54}, "HKST": {0x48, 0x4b, 0x53, 0x54}, "AKDT": {0x41, 0x4b, 0x44, 0x54}, "HADT": {0x48, 0x41, 0x44, 0x54}, "EAT": {0x45, 0x41, 0x54}, "AWST": {0x41, 0x57, 0x53, 0x54}, "PST": {0x50, 0x53, 0x54}, "AST": {0x41, 0x53, 0x54}, "ADT": {0x41, 0x44, 0x54}, "OEZ": {0x4f, 0x45, 0x5a}, "OESZ": {0x4f, 0x45, 0x53, 0x5a}, "ART": {0x41, 0x52, 0x54}, "ECT": {0x45, 0x43, 0x54}, "TMT": {0x54, 0x4d, 0x54}, "BT": {0x42, 0x54}, "MYT": {0x4d, 0x59, 0x54}, "LHDT": {0x4c, 0x48, 0x44, 0x54}, "MDT": {0x4d, 0x44, 0x54}, "ACWDT": {0x41, 0x43, 0x57, 0x44, 0x54}, "EST": {0x45, 0x53, 0x54}, "ACST": {0x41, 0x43, 0x53, 0x54}, "WIB": {0x57, 0x49, 0x42}, "JDT": {0x4a, 0x44, 0x54}, "CLST": {0x43, 0x4c, 0x53, 0x54}, "COT": {0x43, 0x4f, 0x54}, "IST": {0x49, 0x53, 0x54}, "WITA": {0x57, 0x49, 0x54, 0x41}, "WESZ": {0x57, 0x45, 0x53, 0x5a}, "MEZ": {0x4d, 0x45, 0x5a}, "AEDT": {0x41, 0x45, 0x44, 0x54}, "SGT": {0x53, 0x47, 0x54}, "WART": {0x57, 0x41, 0x52, 0x54}, "WEZ": {0x57, 0x45, 0x5a}, "HAT": {0x48, 0x41, 0x54}, "ChST": {0x43, 0x68, 0x53, 0x54}, "VET": {0x56, 0x45, 0x54}, "BOT": {0x42, 0x4f, 0x54}, "SAST": {0x53, 0x41, 0x53, 0x54}, "COST": {0x43, 0x4f, 0x53, 0x54}, "NZDT": {0x4e, 0x5a, 0x44, 0x54}, "GMT": {0x47, 0x4d, 0x54}, "HAST": {0x48, 0x41, 0x53, 0x54}, "WAT": {0x57, 0x41, 0x54}, "ARST": {0x41, 0x52, 0x53, 0x54}, "TMST": {0x54, 0x4d, 0x53, 0x54}, "MESZ": {0x4d, 0x45, 0x53, 0x5a}, "UYST": {0x55, 0x59, 0x53, 0x54}, "WAST": {0x57, 0x41, 0x53, 0x54}, "HNT": {0x48, 0x4e, 0x54}, "GYT": {0x47, 0x59, 0x54}, "SRT": {0x53, 0x52, 0x54}, "WIT": {0x57, 0x49, 0x54}, "NZST": {0x4e, 0x5a, 0x53, 0x54}, "CAT": {0x43, 0x41, 0x54}, "AKST": {0x41, 0x4b, 0x53, 0x54}, "CDT": {0x43, 0x44, 0x54}, "AWDT": {0x41, 0x57, 0x44, 0x54}, "JST": {0x4a, 0x53, 0x54}, "EDT": {0x45, 0x44, 0x54}, "CHADT": {0x43, 0x48, 0x41, 0x44, 0x54}, "CST": {0x43, 0x53, 0x54}, "LHST": {0x4c, 0x48, 0x53, 0x54}, "PDT": {0x50, 0x44, 0x54}, "∅∅∅": {0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85}, "WARST": {0x57, 0x41, 0x52, 0x53, 0x54}, "AEST": {0x41, 0x45, 0x53, 0x54}, "CHAST": {0x43, 0x48, 0x41, 0x53, 0x54}, "UYT": {0x55, 0x59, 0x54}, "GFT": {0x47, 0x46, 0x54}, "CLT": {0x43, 0x4c, 0x54}, "HKT": {0x48, 0x4b, 0x54}},
 	}
 }
 
@@ -363,8 +363,10 @@ func (nd *nd) FmtTimeShort(t time.Time) []byte {
 	if h > 12 {
 		h -= 12
 	}
+
 	b = strconv.AppendInt(b, int64(h), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Minute() < 10 {
 		b = append(b, '0')
 	}
@@ -393,14 +395,17 @@ func (nd *nd) FmtTimeMedium(t time.Time) []byte {
 	if h > 12 {
 		h -= 12
 	}
+
 	b = strconv.AppendInt(b, int64(h), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Minute() < 10 {
 		b = append(b, '0')
 	}
 
 	b = strconv.AppendInt(b, int64(t.Minute()), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Second() < 10 {
 		b = append(b, '0')
 	}
@@ -429,14 +434,17 @@ func (nd *nd) FmtTimeLong(t time.Time) []byte {
 	if h > 12 {
 		h -= 12
 	}
+
 	b = strconv.AppendInt(b, int64(h), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Minute() < 10 {
 		b = append(b, '0')
 	}
 
 	b = strconv.AppendInt(b, int64(t.Minute()), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Second() < 10 {
 		b = append(b, '0')
 	}
@@ -470,14 +478,17 @@ func (nd *nd) FmtTimeFull(t time.Time) []byte {
 	if h > 12 {
 		h -= 12
 	}
+
 	b = strconv.AppendInt(b, int64(h), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Minute() < 10 {
 		b = append(b, '0')
 	}
 
 	b = strconv.AppendInt(b, int64(t.Minute()), 10)
 	b = append(b, nd.timeSeparator...)
+
 	if t.Second() < 10 {
 		b = append(b, '0')
 	}
@@ -494,6 +505,7 @@ func (nd *nd) FmtTimeFull(t time.Time) []byte {
 	b = append(b, []byte{0x20}...)
 
 	tz, _ := t.Zone()
+
 	if btz, ok := nd.timezones[tz]; ok {
 		b = append(b, btz...)
 	} else {
@@ -502,3 +514,51 @@ func (nd *nd) FmtTimeFull(t time.Time) []byte {
 
 	return b
 }
+
+// FmtDateTimeShort returns the short date & time representation of 't' for 'nd'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (nd *nd) FmtDateTimeShort(t time.Time) []byte {
+
+	b := nd.FmtDateShort(t)
+	b = append(b, ' ')
+	b = append(b, nd.FmtTimeShort(t)...)
+
+	return b
+}
+
+// FmtDateTimeMedium returns the medium date & time representation of 't' for 'nd'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (nd *nd) FmtDateTimeMedium(t time.Time) []byte {
+
+	b := nd.FmtDateMedium(t)
+	b = append(b, ' ')
+	b = append(b, nd.FmtTimeMedium(t)...)
+
+	return b
+}
+
+// FmtDateTimeLong returns the long date & time representation of 't' for 'nd'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (nd *nd) FmtDateTimeLong(t time.Time) []byte {
+
+	b := nd.FmtDateLong(t)
+	b = append(b, ' ')
+	b = append(b, nd.FmtTimeLong(t)...)
+
+	return b
+}
+
+// FmtDateTimeFull returns the full date & time representation of 't' for 'nd'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (nd *nd) FmtDateTimeFull(t time.Time) []byte {
+
+	b := nd.FmtDateFull(t)
+	b = append(b, ' ')
+	b = append(b, nd.FmtTimeFull(t)...)
+
+	return b
+}