Correct Weekday in FmtDate functions, was accidentally calling Day() instead of Weekday()

1 files changed, 3 insertions, 3 deletions

diff --git a/prg_001/prg_001.go b/prg_001/prg_001.go
index 9cc70304..fc04e2c5 100644
--- a/prg_001/prg_001.go
+++ b/prg_001/prg_001.go
@@ -66,7 +66,7 @@ func New() locales.Translator {
 		erasAbbreviated:        [][]uint8{{0x42, 0x43}, {0x41, 0x44}},
 		erasNarrow:             [][]uint8{[]uint8(nil), []uint8(nil)},
 		erasWide:               [][]uint8{[]uint8(nil), []uint8(nil)},
-		timezones:              map[string][]uint8{"WAST": {0x57, 0x41, 0x53, 0x54}, "ECT": {0x45, 0x43, 0x54}, "WEZ": {0x57, 0x61, 0x6b, 0x6b, 0x61, 0x72, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "AWST": {0x41, 0x57, 0x53, 0x54}, "WAT": {0x57, 0x41, 0x54}, "OEZ": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "WIB": {0x57, 0x49, 0x42}, "HADT": {0x48, 0x41, 0x44, 0x54}, "WARST": {0x57, 0x41, 0x52, 0x53, 0x54}, "SRT": {0x53, 0x52, 0x54}, "IST": {0x49, 0x53, 0x54}, "∅∅∅": {0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85}, "CHAST": {0x43, 0x48, 0x41, 0x53, 0x54}, "AKST": {0x41, 0x4b, 0x53, 0x54}, "ART": {0x41, 0x52, 0x54}, "BT": {0x42, 0x54}, "BOT": {0x42, 0x4f, 0x54}, "VET": {0x56, 0x45, 0x54}, "GMT": {0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "MDT": {0x4d, 0x44, 0x54}, "COT": {0x43, 0x4f, 0x54}, "ADT": {0x41, 0x74, 0x6c, 0xc4, 0x81, 0x6e, 0x74, 0x69, 0x73, 0x6b, 0x61, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "AWDT": {0x41, 0x57, 0x44, 0x54}, "HNT": {0x48, 0x4e, 0x54}, "OESZ": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "COST": {0x43, 0x4f, 0x53, 0x54}, "TMT": {0x54, 0x4d, 0x54}, "NZST": {0x4e, 0x5a, 0x53, 0x54}, "HAST": {0x48, 0x41, 0x53, 0x54}, "WART": {0x57, 0x41, 0x52, 0x54}, "PST": {0x50, 0x61, 0x63, 0xc4, 0xab, 0x66, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "ACWDT": {0x41, 0x43, 0x57, 0x44, 0x54}, "ChST": {0x43, 0x68, 0x53, 0x54}, "CAT": {0x43, 0x41, 0x54}, "CHADT": {0x43, 0x48, 0x41, 0x44, 0x54}, "ARST": {0x41, 0x52, 0x53, 0x54}, "AKDT": {0x41, 0x4b, 0x44, 0x54}, "MYT": {0x4d, 0x59, 0x54}, "AEDT": {0x41, 0x45, 0x44, 0x54}, "ACDT": {0x41, 0x43, 0x44, 0x54}, "GYT": {0x47, 0x59, 0x54}, "ACWST": {0x41, 0x43, 0x57, 0x53, 0x54}, "HKST": {0x48, 0x4b, 0x53, 0x54}, "JDT": {0x4a, 0x44, 0x54}, "ACST": {0x41, 0x43, 0x53, 0x54}, "SGT": {0x53, 0x47, 0x54}, "GFT": {0x47, 0x46, 0x54}, "MESZ": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "JST": {0x4a, 0x53, 0x54}, "EST": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "EDT": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "UYST": {0x55, 0x59, 0x53, 0x54}, "MEZ": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "SAST": {0x53, 0x41, 0x53, 0x54}, "EAT": {0x45, 0x41, 0x54}, "CST": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "WITA": {0x57, 0x49, 0x54, 0x41}, "HAT": {0x48, 0x41, 0x54}, "LHST": {0x4c, 0x48, 0x53, 0x54}, "LHDT": {0x4c, 0x48, 0x44, 0x54}, "MST": {0x4d, 0x53, 0x54}, "WESZ": {0x57, 0x61, 0x6b, 0x6b, 0x61, 0x72, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "CDT": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "PDT": {0x50, 0x61, 0x63, 0xc4, 0xab, 0x66, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "WIT": {0x57, 0x49, 0x54}, "CLT": {0x43, 0x4c, 0x54}, "AEST": {0x41, 0x45, 0x53, 0x54}, "HKT": {0x48, 0x4b, 0x54}, "TMST": {0x54, 0x4d, 0x53, 0x54}, "AST": {0x41, 0x74, 0x6c, 0xc4, 0x81, 0x6e, 0x74, 0x69, 0x73, 0x6b, 0x61, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "CLST": {0x43, 0x4c, 0x53, 0x54}, "UYT": {0x55, 0x59, 0x54}, "NZDT": {0x4e, 0x5a, 0x44, 0x54}},
+		timezones:              map[string][]uint8{"BOT": {0x42, 0x4f, 0x54}, "LHDT": {0x4c, 0x48, 0x44, 0x54}, "PDT": {0x50, 0x61, 0x63, 0xc4, 0xab, 0x66, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "AST": {0x41, 0x74, 0x6c, 0xc4, 0x81, 0x6e, 0x74, 0x69, 0x73, 0x6b, 0x61, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "CDT": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "HAT": {0x48, 0x41, 0x54}, "LHST": {0x4c, 0x48, 0x53, 0x54}, "SRT": {0x53, 0x52, 0x54}, "ChST": {0x43, 0x68, 0x53, 0x54}, "BT": {0x42, 0x54}, "CST": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "WIB": {0x57, 0x49, 0x42}, "TMT": {0x54, 0x4d, 0x54}, "NZDT": {0x4e, 0x5a, 0x44, 0x54}, "PST": {0x50, 0x61, 0x63, 0xc4, 0xab, 0x66, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "ECT": {0x45, 0x43, 0x54}, "ACWDT": {0x41, 0x43, 0x57, 0x44, 0x54}, "SGT": {0x53, 0x47, 0x54}, "JDT": {0x4a, 0x44, 0x54}, "CHADT": {0x43, 0x48, 0x41, 0x44, 0x54}, "SAST": {0x53, 0x41, 0x53, 0x54}, "CLST": {0x43, 0x4c, 0x53, 0x54}, "ARST": {0x41, 0x52, 0x53, 0x54}, "WITA": {0x57, 0x49, 0x54, 0x41}, "UYST": {0x55, 0x59, 0x53, 0x54}, "ADT": {0x41, 0x74, 0x6c, 0xc4, 0x81, 0x6e, 0x74, 0x69, 0x73, 0x6b, 0x61, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "VET": {0x56, 0x45, 0x54}, "WAST": {0x57, 0x41, 0x53, 0x54}, "AKDT": {0x41, 0x4b, 0x44, 0x54}, "GMT": {0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "MST": {0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x67, 0xc4, 0x81, 0x72, 0x62, 0x61, 0x6e, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "MEZ": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "AEDT": {0x41, 0x45, 0x44, 0x54}, "ART": {0x41, 0x52, 0x54}, "∅∅∅": {0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85, 0xe2, 0x88, 0x85}, "TMST": {0x54, 0x4d, 0x53, 0x54}, "ACDT": {0x41, 0x43, 0x44, 0x54}, "GYT": {0x47, 0x59, 0x54}, "MESZ": {0x43, 0x65, 0x6e, 0x74, 0x72, 0xc4, 0x81, 0x6c, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "AKST": {0x41, 0x4b, 0x53, 0x54}, "WART": {0x57, 0x41, 0x52, 0x54}, "OEZ": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "EST": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "WEZ": {0x57, 0x61, 0x6b, 0x6b, 0x61, 0x72, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x7a, 0xc4, 0x93, 0x69, 0x6d, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "CAT": {0x43, 0x41, 0x54}, "WESZ": {0x57, 0x61, 0x6b, 0x6b, 0x61, 0x72, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "WAT": {0x57, 0x41, 0x54}, "GFT": {0x47, 0x46, 0x54}, "CHAST": {0x43, 0x48, 0x41, 0x53, 0x54}, "WARST": {0x57, 0x41, 0x52, 0x53, 0x54}, "HAST": {0x48, 0x41, 0x53, 0x54}, "HADT": {0x48, 0x41, 0x44, 0x54}, "HKST": {0x48, 0x4b, 0x53, 0x54}, "COT": {0x43, 0x4f, 0x54}, "COST": {0x43, 0x4f, 0x53, 0x54}, "HKT": {0x48, 0x4b, 0x54}, "MYT": {0x4d, 0x59, 0x54}, "WIT": {0x57, 0x49, 0x54}, "AWST": {0x41, 0x57, 0x53, 0x54}, "AWDT": {0x41, 0x57, 0x44, 0x54}, "UYT": {0x55, 0x59, 0x54}, "EAT": {0x45, 0x41, 0x54}, "CLT": {0x43, 0x4c, 0x54}, "IST": {0x49, 0x53, 0x54}, "HNT": {0x48, 0x4e, 0x54}, "MDT": {0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x67, 0xc4, 0x81, 0x72, 0x62, 0x61, 0x6e, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "OESZ": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x45, 0x75, 0x72, 0xc5, 0x8d, 0x70, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}, "AEST": {0x41, 0x45, 0x53, 0x54}, "JST": {0x4a, 0x53, 0x54}, "NZST": {0x4e, 0x5a, 0x53, 0x54}, "ACST": {0x41, 0x43, 0x53, 0x54}, "ACWST": {0x41, 0x43, 0x57, 0x53, 0x54}, "EDT": {0x44, 0xc4, 0x93, 0x69, 0x6e, 0x69, 0x73, 0x6b, 0x61, 0x73, 0x20, 0x41, 0x6d, 0xc4, 0x93, 0x72, 0x69, 0x6b, 0x61, 0x73, 0x20, 0x64, 0x61, 0x67, 0x67, 0x61, 0x73, 0x20, 0x6b, 0x65, 0x72, 0x64, 0xc4, 0x81}},
 	}
 }
 
@@ -90,8 +90,8 @@ func (prg *prg_001) CardinalPluralRule(num float64, v uint64) locales.PluralRule
 
 	n := math.Abs(num)
 	f := locales.F(n, v)
-	nMod100 := math.Mod(n, 100)
 	nMod10 := math.Mod(n, 10)
+	nMod100 := math.Mod(n, 100)
 	fMod100 := f % 100
 	fMod10 := f % 10
 
@@ -477,7 +477,7 @@ func (prg *prg_001) FmtDateFull(t time.Time) []byte {
 
 	b := make([]byte, 0, 32)
 
-	b = append(b, prg.daysWide[t.Day()]...)
+	b = append(b, prg.daysWide[t.Weekday()]...)
 	b = append(b, []byte{0x2c, 0x20}...)
 	b = strconv.AppendInt(b, int64(t.Year()), 10)
 	b = append(b, []byte{}...)