look at timezones to see if can set appropriately in FmtTime...

1 files changed, 197 insertions, 1 deletions

diff --git a/root/root.go b/root/root.go
index 294e4dd4..61e856ad 100644
--- a/root/root.go
+++ b/root/root.go
@@ -3,6 +3,7 @@ package root
 import (
 	"math"
 	"strconv"
+	"time"
 
 	"github.com/go-playground/locales"
 	"github.com/go-playground/locales/currency"
@@ -19,6 +20,8 @@ type root struct {
 	percentPrefix          []byte
 	percentSuffix          []byte
 	perMille               []byte
+	timeSeparator          []byte
+	inifinity              []byte
 	currencies             [][]byte // idx = enum of currency code
 	currencyPositivePrefix []byte
 	currencyPositiveSuffix []byte
@@ -52,6 +55,7 @@ func New() locales.Translator {
 		minus:              []byte{},
 		percent:            []byte{},
 		perMille:           []byte{},
+		timeSeparator:      []byte{0x3a},
 		currencies:         [][]uint8{{0x41, 0x44, 0x50}, {0x41, 0x45, 0x44}, {0x41, 0x46, 0x41}, {0x41, 0x46, 0x4e}, {0x41, 0x4c, 0x4b}, {0x41, 0x4c, 0x4c}, {0x41, 0x4d, 0x44}, {0x41, 0x4e, 0x47}, {0x4b, 0x7a}, {0x41, 0x4f, 0x4b}, {0x41, 0x4f, 0x4e}, {0x41, 0x4f, 0x52}, {0x41, 0x52, 0x41}, {0x41, 0x52, 0x4c}, {0x41, 0x52, 0x4d}, {0x41, 0x52, 0x50}, {0x24}, {0x41, 0x54, 0x53}, {0x41, 0x24}, {0x41, 0x57, 0x47}, {0x41, 0x5a, 0x4d}, {0x41, 0x5a, 0x4e}, {0x42, 0x41, 0x44}, {0x4b, 0x4d}, {0x42, 0x41, 0x4e}, {0x24}, {0xe0, 0xa7, 0xb3}, {0x42, 0x45, 0x43}, {0x42, 0x45, 0x46}, {0x42, 0x45, 0x4c}, {0x42, 0x47, 0x4c}, {0x42, 0x47, 0x4d}, {0x42, 0x47, 0x4e}, {0x42, 0x47, 0x4f}, {0x42, 0x48, 0x44}, {0x42, 0x49, 0x46}, {0x24}, {0x24}, {0x42, 0x73}, {0x42, 0x4f, 0x4c}, {0x42, 0x4f, 0x50}, {0x42, 0x4f, 0x56}, {0x42, 0x52, 0x42}, {0x42, 0x52, 0x43}, {0x42, 0x52, 0x45}, {0x52, 0x24}, {0x42, 0x52, 0x4e}, {0x42, 0x52, 0x52}, {0x42, 0x52, 0x5a}, {0x24}, {0x42, 0x54, 0x4e}, {0x42, 0x55, 0x4b}, {0x50}, {0x42, 0x59, 0x42}, {0xd1, 0x80, 0x2e}, {0x24}, {0x43, 0x41, 0x24}, {0x43, 0x44, 0x46}, {0x43, 0x48, 0x45}, {0x43, 0x48, 0x46}, {0x43, 0x48, 0x57}, {0x43, 0x4c, 0x45}, {0x43, 0x4c, 0x46}, {0x24}, {0x43, 0x4e, 0x58}, {0x43, 0x4e, 0xc2, 0xa5}, {0x24}, {0x43, 0x4f, 0x55}, {0xe2, 0x82, 0xa1}, {0x43, 0x53, 0x44}, {0x43, 0x53, 0x4b}, {0x24}, {0x24}, {0x43, 0x56, 0x45}, {0x43, 0x59, 0x50}, {0x4b, 0xc4, 0x8d}, {0x44, 0x44, 0x4d}, {0x44, 0x45, 0x4d}, {0x44, 0x4a, 0x46}, {0x6b, 0x72}, {0x24}, {0x44, 0x5a, 0x44}, {0x45, 0x43, 0x53}, {0x45, 0x43, 0x56}, {0x45, 0x45, 0x4b}, {0x45, 0xc2, 0xa3}, {0x45, 0x52, 0x4e}, {0x45, 0x53, 0x41}, {0x45, 0x53, 0x42}, {0xe2, 0x82, 0xa7}, {0x45, 0x54, 0x42}, {0xe2, 0x82, 0xac}, {0x46, 0x49, 0x4d}, {0x24}, {0xc2, 0xa3}, {0x46, 0x52, 0x46}, {0xc2, 0xa3}, {0x47, 0x45, 0x4b}, {0xe2, 0x82, 0xbe}, {0x47, 0x48, 0x43}, {0x47, 0x48, 0x53}, {0xc2, 0xa3}, {0x47, 0x4d, 0x44}, {0x46, 0x47}, {0x47, 0x4e, 0x53}, {0x47, 0x51, 0x45}, {0x47, 0x52, 0x44}, {0x51}, {0x47, 0x57, 0x45}, {0x47, 0x57, 0x50}, {0x24}, {0x48, 0x4b, 0x24}, {0x4c}, {0x48, 0x52, 0x44}, {0x6b, 0x6e}, {0x48, 0x54, 0x47}, {0x46, 0x74}, {0x52, 0x70}, {0x49, 0x45, 0x50}, {0x49, 0x4c, 0x50}, {0x49, 0x4c, 0x52}, {0xe2, 0x82, 0xaa}, {0xe2, 0x82, 0xb9}, {0x49, 0x51, 0x44}, {0x49, 0x52, 0x52}, {0x49, 0x53, 0x4a}, {0x6b, 0x72}, {0x49, 0x54, 0x4c}, {0x24}, {0x4a, 0x4f, 0x44}, {0x4a, 0x50, 0xc2, 0xa5}, {0x4b, 0x45, 0x53}, {0x4b, 0x47, 0x53}, {0xe1, 0x9f, 0x9b}, {0x43, 0x46}, {0xe2, 0x82, 0xa9}, {0x4b, 0x52, 0x48}, {0x4b, 0x52, 0x4f}, {0xe2, 0x82, 0xa9}, {0x4b, 0x57, 0x44}, {0x24}, {0xe2, 0x82, 0xb8}, {0xe2, 0x82, 0xad}, {0x4c, 0xc2, 0xa3}, {0x52, 0x73}, {0x24}, {0x4c, 0x53, 0x4c}, {0x4c, 0x74}, {0x4c, 0x54, 0x54}, {0x4c, 0x55, 0x43}, {0x4c, 0x55, 0x46}, {0x4c, 0x55, 0x4c}, {0x4c, 0x73}, {0x4c, 0x56, 0x52}, {0x4c, 0x59, 0x44}, {0x4d, 0x41, 0x44}, {0x4d, 0x41, 0x46}, {0x4d, 0x43, 0x46}, {0x4d, 0x44, 0x43}, {0x4d, 0x44, 0x4c}, {0x41, 0x72}, {0x4d, 0x47, 0x46}, {0x4d, 0x4b, 0x44}, {0x4d, 0x4b, 0x4e}, {0x4d, 0x4c, 0x46}, {0x4b}, {0xe2, 0x82, 0xae}, {0x4d, 0x4f, 0x50}, {0x4d, 0x52, 0x4f}, {0x4d, 0x54, 0x4c}, {0x4d, 0x54, 0x50}, {0x52, 0x73}, {0x4d, 0x56, 0x50}, {0x4d, 0x56, 0x52}, {0x4d, 0x57, 0x4b}, {0x4d, 0x58, 0x24}, {0x4d, 0x58, 0x50}, {0x4d, 0x58, 0x56}, {0x52, 0x4d}, {0x4d, 0x5a, 0x45}, {0x4d, 0x5a, 0x4d}, {0x4d, 0x5a, 0x4e}, {0x24}, {0xe2, 0x82, 0xa6}, {0x4e, 0x49, 0x43}, {0x43, 0x24}, {0x4e, 0x4c, 0x47}, {0x6b, 0x72}, {0x52, 0x73}, {0x4e, 0x5a, 0x24}, {0x4f, 0x4d, 0x52}, {0x50, 0x41, 0x42}, {0x50, 0x45, 0x49}, {0x50, 0x45, 0x4e}, {0x50, 0x45, 0x53}, {0x50, 0x47, 0x4b}, {0xe2, 0x82, 0xb1}, {0x52, 0x73}, {0x7a, 0xc5, 0x82}, {0x50, 0x4c, 0x5a}, {0x50, 0x54, 0x45}, {0xe2, 0x82, 0xb2}, {0x51, 0x41, 0x52}, {0x52, 0x48, 0x44}, {0x52, 0x4f, 0x4c}, {0x52, 0x4f, 0x4e}, {0x52, 0x53, 0x44}, {0xe2, 0x82, 0xbd}, {0xd1, 0x80, 0x2e}, {0x52, 0x46}, {0x53, 0x41, 0x52}, {0x24}, {0x53, 0x43, 0x52}, {0x53, 0x44, 0x44}, {0x53, 0x44, 0x47}, {0x53, 0x44, 0x50}, {0x6b, 0x72}, {0x24}, {0xc2, 0xa3}, {0x53, 0x49, 0x54}, {0x53, 0x4b, 0x4b}, {0x53, 0x4c, 0x4c}, {0x53, 0x4f, 0x53}, {0x24}, {0x53, 0x52, 0x47}, {0xc2, 0xa3}, {0x44, 0x62}, {0x53, 0x55, 0x52}, {0x53, 0x56, 0x43}, {0xc2, 0xa3}, {0x53, 0x5a, 0x4c}, {0xe0, 0xb8, 0xbf}, {0x54, 0x4a, 0x52}, {0x54, 0x4a, 0x53}, {0x54, 0x4d, 0x4d}, {0x54, 0x4d, 0x54}, {0x54, 0x4e, 0x44}, {0x54, 0x24}, {0x54, 0x50, 0x45}, {0x54, 0x52, 0x4c}, {0xe2, 0x82, 0xba}, {0x24}, {0x4e, 0x54, 0x24}, {0x54, 0x5a, 0x53}, {0xe2, 0x82, 0xb4}, {0x55, 0x41, 0x4b}, {0x55, 0x47, 0x53}, {0x55, 0x47, 0x58}, {0x55, 0x53, 0x24}, {0x55, 0x53, 0x4e}, {0x55, 0x53, 0x53}, {0x55, 0x59, 0x49}, {0x55, 0x59, 0x50}, {0x24}, {0x55, 0x5a, 0x53}, {0x56, 0x45, 0x42}, {0x42, 0x73}, {0xe2, 0x82, 0xab}, {0x56, 0x4e, 0x4e}, {0x56, 0x55, 0x56}, {0x57, 0x53, 0x54}, {0x46, 0x43, 0x46, 0x41}, {0x58, 0x41, 0x47}, {0x58, 0x41, 0x55}, {0x58, 0x42, 0x41}, {0x58, 0x42, 0x42}, {0x58, 0x42, 0x43}, {0x58, 0x42, 0x44}, {0x45, 0x43, 0x24}, {0x58, 0x44, 0x52}, {0x58, 0x45, 0x55}, {0x58, 0x46, 0x4f}, {0x58, 0x46, 0x55}, {0x43, 0x46, 0x41}, {0x58, 0x50, 0x44}, {0x43, 0x46, 0x50, 0x46}, {0x58, 0x50, 0x54}, {0x58, 0x52, 0x45}, {0x58, 0x53, 0x55}, {0x58, 0x54, 0x53}, {0x58, 0x55, 0x41}, {0x58, 0x58, 0x58}, {0x59, 0x44, 0x44}, {0x59, 0x45, 0x52}, {0x59, 0x55, 0x44}, {0x59, 0x55, 0x4d}, {0x59, 0x55, 0x4e}, {0x59, 0x55, 0x52}, {0x5a, 0x41, 0x4c}, {0x52}, {0x5a, 0x4d, 0x4b}, {0x5a, 0x4b}, {0x5a, 0x52, 0x4e}, {0x5a, 0x52, 0x5a}, {0x5a, 0x57, 0x44}, {0x5a, 0x57, 0x4c}, {0x5a, 0x57, 0x52}},
 		monthsNarrow:       [][]uint8{[]uint8(nil), {0x31}, {0x32}, {0x33}, {0x34}, {0x35}, {0x36}, {0x37}, {0x38}, {0x39}, {0x31, 0x30}, {0x31, 0x31}, {0x31, 0x32}},
 		monthsWide:         [][]uint8{[]uint8(nil), {0x4d, 0x30, 0x31}, {0x4d, 0x30, 0x32}, {0x4d, 0x30, 0x33}, {0x4d, 0x30, 0x34}, {0x4d, 0x30, 0x35}, {0x4d, 0x30, 0x36}, {0x4d, 0x30, 0x37}, {0x4d, 0x30, 0x38}, {0x4d, 0x30, 0x39}, {0x4d, 0x31, 0x30}, {0x4d, 0x31, 0x31}, {0x4d, 0x31, 0x32}},
@@ -62,7 +66,8 @@ func New() locales.Translator {
 		periodsWide:        [][]uint8{[]uint8(nil), []uint8(nil)},
 		erasAbbreviated:    [][]uint8{{0x42, 0x43, 0x45}, {0x43, 0x45}},
 		erasNarrow:         [][]uint8{[]uint8(nil), []uint8(nil)},
-		erasWide:           [][]uint8{[]uint8(nil), []uint8(nil)}}
+		erasWide:           [][]uint8{[]uint8(nil), []uint8(nil)},
+	}
 }
 
 // Locale returns the current translators string locale
@@ -133,3 +138,194 @@ func (root *root) FmtAccounting(num float64, v uint64, currency currency.Type) [
 	symbol := root.currencies[currency]
 	return append(append([]byte{}, symbol...), s...)
 }
+
+// FmtDateShort returns the short date representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtDateShort(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	b = strconv.AppendInt(b, int64(t.Year()), 10)
+	b = append(b, []byte{0x2d}...)
+
+	if t.Month() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Month()), 10)
+
+	b = append(b, []byte{0x2d}...)
+
+	if t.Day() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Day()), 10)
+
+	return b
+}
+
+// FmtDateMedium returns the medium date representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtDateMedium(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	b = strconv.AppendInt(b, int64(t.Year()), 10)
+	b = append(b, []byte{0x20}...)
+	b = append(b, root.monthsAbbreviated[t.Month()]...)
+	b = append(b, []byte{0x20}...)
+	b = strconv.AppendInt(b, int64(t.Day()), 10)
+
+	return b
+}
+
+// FmtDateLong returns the long date representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtDateLong(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	b = strconv.AppendInt(b, int64(t.Year()), 10)
+	b = append(b, []byte{0x20}...)
+	b = append(b, root.monthsWide[t.Month()]...)
+	b = append(b, []byte{0x20}...)
+	b = strconv.AppendInt(b, int64(t.Day()), 10)
+
+	return b
+}
+
+// FmtDateFull returns the full date representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtDateFull(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	b = strconv.AppendInt(b, int64(t.Year()), 10)
+	b = append(b, []byte{0x20}...)
+	b = append(b, root.monthsWide[t.Month()]...)
+	b = append(b, []byte{0x20}...)
+	b = strconv.AppendInt(b, int64(t.Day()), 10)
+	b = append(b, []byte{0x2c, 0x20}...)
+	b = append(b, root.daysWide[t.Day()]...)
+
+	return b
+}
+
+// FmtTimeShort returns the short time representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtTimeShort(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	if t.Hour() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Hour()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Minute() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Minute()), 10)
+
+	return b
+}
+
+// FmtTimeMedium returns the medium time representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtTimeMedium(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	if t.Hour() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Hour()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Minute() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Minute()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Second() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Second()), 10)
+
+	return b
+}
+
+// FmtTimeLong returns the long time representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtTimeLong(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	if t.Hour() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Hour()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Minute() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Minute()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Second() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Second()), 10)
+	b = append(b, []byte{0x20}...)
+
+	tz, _ := t.Zone()
+	b = append(b, tz...)
+
+	return b
+}
+
+// FmtTimeFull returns the full time representation of 't' for 'root'
+// returned as a []byte just in case the caller wishes to add more and can help
+// avoid allocations; otherwise just cast as string.
+func (root *root) FmtTimeFull(t time.Time) []byte {
+
+	b := make([]byte, 0, 32)
+
+	if t.Hour() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Hour()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Minute() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Minute()), 10)
+	b = append(b, root.timeSeparator...)
+	if t.Second() < 10 {
+		b = append(b, '0')
+	}
+
+	b = strconv.AppendInt(b, int64(t.Second()), 10)
+	b = append(b, []byte{0x20}...)
+
+	tz, _ := t.Zone()
+	b = append(b, tz...)
+
+	return b
+}