From 7433bc2714ee97d97a4de5702bf99a055c464cef Mon Sep 17 00:00:00 2001 From: joeybloggs Date: Thu, 9 Feb 2017 10:56:59 -0500 Subject: Update to CLDR v30.0.3 - Regenerated locale data from v30.0.3 CLDR data - Added negative year check for FmtDataXXX functions with 4 digit years - update ru_RU test to handle change of short date format from v29 dd.MM.yy to v30 dd.MM.y --- ig/ig.go | 290 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 175 insertions(+), 115 deletions(-) (limited to 'ig') diff --git a/ig/ig.go b/ig/ig.go index 7b638cbc..cffc159b 100644 --- a/ig/ig.go +++ b/ig/ig.go @@ -10,58 +10,64 @@ import ( ) type ig struct { - locale string - pluralsCardinal []locales.PluralRule - pluralsOrdinal []locales.PluralRule - pluralsRange []locales.PluralRule - decimal string - group string - minus string - percent string - perMille string - timeSeparator string - inifinity string - currencies []string // idx = enum of currency code - currencyNegativePrefix string - currencyNegativeSuffix string - monthsAbbreviated []string - monthsNarrow []string - monthsWide []string - daysAbbreviated []string - daysNarrow []string - daysShort []string - daysWide []string - periodsAbbreviated []string - periodsNarrow []string - periodsShort []string - periodsWide []string - erasAbbreviated []string - erasNarrow []string - erasWide []string - timezones map[string]string + locale string + pluralsCardinal []locales.PluralRule + pluralsOrdinal []locales.PluralRule + pluralsRange []locales.PluralRule + decimal string + group string + minus string + percent string + percentSuffix string + perMille string + timeSeparator string + inifinity string + currencies []string // idx = enum of currency code + monthsAbbreviated []string + monthsNarrow []string + monthsWide []string + daysAbbreviated []string + daysNarrow []string + daysShort []string + daysWide []string + periodsAbbreviated []string + periodsNarrow []string + periodsShort []string + periodsWide []string + erasAbbreviated []string + erasNarrow []string + erasWide []string + timezones map[string]string } // New returns a new instance of translator for the 'ig' locale func New() locales.Translator { return &ig{ - locale: "ig", - pluralsCardinal: []locales.PluralRule{6}, - pluralsOrdinal: nil, - pluralsRange: nil, - timeSeparator: ":", - currencies: []string{"ADP", "AED", "AFA", "AFN", "ALK", "ALL", "AMD", "ANG", "AOA", "AOK", "AON", "AOR", "ARA", "ARL", "ARM", "ARP", "ARS", "ATS", "AUD", "AWG", "AZM", "AZN", "BAD", "BAM", "BAN", "BBD", "BDT", "BEC", "BEF", "BEL", "BGL", "BGM", "BGN", "BGO", "BHD", "BIF", "BMD", "BND", "BOB", "BOL", "BOP", "BOV", "BRB", "BRC", "BRE", "BRL", "BRN", "BRR", "BRZ", "BSD", "BTN", "BUK", "BWP", "BYB", "BYR", "BZD", "CAD", "CDF", "CHE", "CHF", "CHW", "CLE", "CLF", "CLP", "CNX", "CNY", "COP", "COU", "CRC", "CSD", "CSK", "CUC", "CUP", "CVE", "CYP", "CZK", "DDM", "DEM", "DJF", "DKK", "DOP", "DZD", "ECS", "ECV", "EEK", "EGP", "ERN", "ESA", "ESB", "ESP", "ETB", "EUR", "FIM", "FJD", "FKP", "FRF", "GBP", "GEK", "GEL", "GHC", "GHS", "GIP", "GMD", "GNF", "GNS", "GQE", "GRD", "GTQ", "GWE", "GWP", "GYD", "HKD", "HNL", "HRD", "HRK", "HTG", "HUF", "IDR", "IEP", "ILP", "ILR", "ILS", "INR", "IQD", "IRR", "ISJ", "ISK", "ITL", "JMD", "JOD", "JPY", "KES", "KGS", "KHR", "KMF", "KPW", "KRH", "KRO", "KRW", "KWD", "KYD", "KZT", "LAK", "LBP", "LKR", "LRD", "LSL", "LTL", "LTT", "LUC", "LUF", "LUL", "LVL", "LVR", "LYD", "MAD", "MAF", "MCF", "MDC", "MDL", "MGA", "MGF", "MKD", "MKN", "MLF", "MMK", "MNT", "MOP", "MRO", "MTL", "MTP", "MUR", "MVP", "MVR", "MWK", "MXN", "MXP", "MXV", "MYR", "MZE", "MZM", "MZN", "NAD", "₦", "NIC", "NIO", "NLG", "NOK", "NPR", "NZD", "OMR", "PAB", "PEI", "PEN", "PES", "PGK", "PHP", "PKR", "PLN", "PLZ", "PTE", "PYG", "QAR", "RHD", "ROL", "RON", "RSD", "RUB", "RUR", "RWF", "SAR", "SBD", "SCR", "SDD", "SDG", "SDP", "SEK", "SGD", "SHP", "SIT", "SKK", "SLL", "SOS", "SRD", "SRG", "SSP", "STD", "SUR", "SVC", "SYP", "SZL", "THB", "TJR", "TJS", "TMM", "TMT", "TND", "TOP", "TPE", "TRL", "TRY", "TTD", "TWD", "TZS", "UAH", "UAK", "UGS", "UGX", "USD", "USN", "USS", "UYI", "UYP", "UYU", "UZS", "VEB", "VEF", "VND", "VNN", "VUV", "WST", "XAF", "XAG", "XAU", "XBA", "XBB", "XBC", "XBD", "XCD", "XDR", "XEU", "XFO", "XFU", "XOF", "XPD", "XPF", "XPT", "XRE", "XSU", "XTS", "XUA", "XXX", "YDD", "YER", "YUD", "YUM", "YUN", "YUR", "ZAL", "ZAR", "ZMK", "ZMW", "ZRN", "ZRZ", "ZWD", "ZWL", "ZWR"}, - currencyNegativePrefix: "(", - currencyNegativeSuffix: ")", - monthsAbbreviated: []string{"", "Jen", "Feb", "Maa", "Epr", "Mee", "Juu", "Jul", "Ọgọ", "Sep", "Ọkt", "Nov", "Dis"}, - monthsWide: []string{"", "Jenụwarị", "Febrụwarị", "Maachị", "Eprel", "Mee", "Juun", "Julaị", "Ọgọọst", "Septemba", "Ọktoba", "Novemba", "Disemba"}, - daysAbbreviated: []string{"Ụka", "Mọn", "Tiu", "Wen", "Tọọ", "Fraị", "Sat"}, - daysWide: []string{"Mbọsị Ụka", "Mọnde", "Tiuzdee", "Wenezdee", "Tọọzdee", "Fraịdee", "Satọdee"}, - periodsAbbreviated: []string{"A.M.", "P.M."}, - periodsWide: []string{"A.M.", "P.M."}, - erasAbbreviated: []string{"T.K.", "A.K."}, - erasNarrow: []string{"", ""}, - erasWide: []string{"Tupu Kristi", "Afọ Kristi"}, - timezones: map[string]string{"WAST": "WAST", "CDT": "CDT", "MDT": "MDT", "CLT": "CLT", "∅∅∅": "∅∅∅", "BT": "BT", "HNT": "HNT", "CHAST": "CHAST", "SGT": "SGT", "WARST": "WARST", "WAT": "WAT", "MESZ": "MESZ", "ECT": "ECT", "EDT": "EDT", "CST": "CST", "MST": "MST", "NZDT": "NZDT", "UYT": "UYT", "ART": "ART", "PST": "PST", "CLST": "CLST", "LHST": "LHST", "OESZ": "OESZ", "HADT": "HADT", "PDT": "PDT", "HAT": "HAT", "LHDT": "LHDT", "ACWDT": "ACWDT", "ADT": "ADT", "SAST": "SAST", "WITA": "WITA", "ChST": "ChST", "WEZ": "WEZ", "COT": "COT", "EAT": "EAT", "TMT": "TMT", "MEZ": "MEZ", "COST": "COST", "WART": "WART", "AWDT": "AWDT", "HAST": "HAST", "AEST": "AEST", "ACDT": "ACDT", "ACWST": "ACWST", "TMST": "TMST", "CAT": "CAT", "WIT": "WIT", "OEZ": "OEZ", "WIB": "WIB", "ACST": "ACST", "IST": "IST", "AKST": "AKST", "AEDT": "AEDT", "NZST": "NZST", "HKT": "HKT", "HKST": "HKST", "VET": "VET", "AST": "AST", "AKDT": "AKDT", "MYT": "MYT", "UYST": "UYST", "JST": "JST", "BOT": "BOT", "SRT": "SRT", "WESZ": "WESZ", "CHADT": "CHADT", "GFT": "GFT", "EST": "EST", "AWST": "AWST", "ARST": "ARST", "GYT": "GYT", "GMT": "GMT", "JDT": "JDT"}, + locale: "ig", + pluralsCardinal: []locales.PluralRule{6}, + pluralsOrdinal: nil, + pluralsRange: nil, + decimal: "٫", + group: "٬", + perMille: "؉", + timeSeparator: ":", + inifinity: "∞", + currencies: []string{"ADP", "AED", "AFA", "AFN", "ALK", "ALL", "AMD", "ANG", "AOA", "AOK", "AON", "AOR", "ARA", "ARL", "ARM", "ARP", "ARS", "ATS", "AUD", "AWG", "AZM", "AZN", "BAD", "BAM", "BAN", "BBD", "BDT", "BEC", "BEF", "BEL", "BGL", "BGM", "BGN", "BGO", "BHD", "BIF", "BMD", "BND", "BOB", "BOL", "BOP", "BOV", "BRB", "BRC", "BRE", "BRL", "BRN", "BRR", "BRZ", "BSD", "BTN", "BUK", "BWP", "BYB", "BYN", "BYR", "BZD", "CAD", "CDF", "CHE", "CHF", "CHW", "CLE", "CLF", "CLP", "CNX", "CNY", "COP", "COU", "CRC", "CSD", "CSK", "CUC", "CUP", "CVE", "CYP", "CZK", "DDM", "DEM", "DJF", "DKK", "DOP", "DZD", "ECS", "ECV", "EEK", "EGP", "ERN", "ESA", "ESB", "ESP", "ETB", "EUR", "FIM", "FJD", "FKP", "FRF", "GBP", "GEK", "GEL", "GHC", "GHS", "GIP", "GMD", "GNF", "GNS", "GQE", "GRD", "GTQ", "GWE", "GWP", "GYD", "HKD", "HNL", "HRD", "HRK", "HTG", "HUF", "IDR", "IEP", "ILP", "ILR", "ILS", "INR", "IQD", "IRR", "ISJ", "ISK", "ITL", "JMD", "JOD", "JPY", "KES", "KGS", "KHR", "KMF", "KPW", "KRH", "KRO", "KRW", "KWD", "KYD", "KZT", "LAK", "LBP", "LKR", "LRD", "LSL", "LTL", "LTT", "LUC", "LUF", "LUL", "LVL", "LVR", "LYD", "MAD", "MAF", "MCF", "MDC", "MDL", "MGA", "MGF", "MKD", "MKN", "MLF", "MMK", "MNT", "MOP", "MRO", "MTL", "MTP", "MUR", "MVP", "MVR", "MWK", "MXN", "MXP", "MXV", "MYR", "MZE", "MZM", "MZN", "NAD", "₦", "NIC", "NIO", "NLG", "NOK", "NPR", "NZD", "OMR", "PAB", "PEI", "PEN", "PES", "PGK", "PHP", "PKR", "PLN", "PLZ", "PTE", "PYG", "QAR", "RHD", "ROL", "RON", "RSD", "RUB", "RUR", "RWF", "SAR", "SBD", "SCR", "SDD", "SDG", "SDP", "SEK", "SGD", "SHP", "SIT", "SKK", "SLL", "SOS", "SRD", "SRG", "SSP", "STD", "SUR", "SVC", "SYP", "SZL", "THB", "TJR", "TJS", "TMM", "TMT", "TND", "TOP", "TPE", "TRL", "TRY", "TTD", "TWD", "TZS", "UAH", "UAK", "UGS", "UGX", "USD", "USN", "USS", "UYI", "UYP", "UYU", "UZS", "VEB", "VEF", "VND", "VNN", "VUV", "WST", "XAF", "XAG", "XAU", "XBA", "XBB", "XBC", "XBD", "XCD", "XDR", "XEU", "XFO", "XFU", "XOF", "XPD", "XPF", "XPT", "XRE", "XSU", "XTS", "XUA", "XXX", "YDD", "YER", "YUD", "YUM", "YUN", "YUR", "ZAL", "ZAR", "ZMK", "ZMW", "ZRN", "ZRZ", "ZWD", "ZWL", "ZWR"}, + percentSuffix: " ", + monthsAbbreviated: []string{"", "Jen", "Feb", "Maa", "Epr", "Mee", "Juu", "Jul", "Ọgọ", "Sep", "Ọkt", "Nov", "Dis"}, + monthsNarrow: []string{"", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"}, + monthsWide: []string{"", "Jenụwarị", "Febrụwarị", "Maachị", "Eprel", "Mee", "Juun", "Julaị", "Ọgọọst", "Septemba", "Ọktoba", "Novemba", "Disemba"}, + daysAbbreviated: []string{"Ụka", "Mọn", "Tiu", "Wen", "Tọọ", "Fraị", "Sat"}, + daysNarrow: []string{"S", "M", "T", "W", "T", "F", "S"}, + daysShort: []string{"Ụka", "Mọn", "Tiu", "Wen", "Tọọ", "Fraị", "Sat"}, + daysWide: []string{"Mbọsị Ụka", "Mọnde", "Tiuzdee", "Wenezdee", "Tọọzdee", "Fraịdee", "Satọdee"}, + periodsAbbreviated: []string{"A.M.", "P.M."}, + periodsNarrow: []string{"A.M.", "P.M."}, + periodsWide: []string{"A.M.", "P.M."}, + erasAbbreviated: []string{"T.K.", "A.K."}, + erasNarrow: []string{"T.K.", "A.K."}, + erasWide: []string{"Tupu Kristi", "Afọ Kristi"}, + timezones: map[string]string{"HNPMX": "HNPMX", "ADT": "ADT", "MESZ": "MESZ", "NZST": "NZST", "EDT": "EDT", "UYST": "UYST", "SRT": "SRT", "EST": "EST", "HNOG": "HNOG", "CHADT": "CHADT", "JDT": "JDT", "HAST": "HAST", "BT": "BT", "WEZ": "WEZ", "WITA": "WITA", "SAST": "SAST", "GFT": "GFT", "TMT": "TMT", "PDT": "PDT", "AEST": "AEST", "EAT": "EAT", "TMST": "TMST", "HEPMX": "HEPMX", "CST": "CST", "GYT": "GYT", "AWDT": "AWDT", "MEZ": "MEZ", "HNEG": "HNEG", "HEEG": "HEEG", "WART": "WART", "AKDT": "AKDT", "PST": "PST", "ARST": "ARST", "HKT": "HKT", "HNNOMX": "HNNOMX", "UYT": "UYT", "VET": "VET", "ACWST": "ACWST", "ACWDT": "ACWDT", "HKST": "HKST", "HNPM": "HNPM", "ChST": "ChST", "MST": "MST", "CLT": "CLT", "JST": "JST", "WAT": "WAT", "OESZ": "OESZ", "ECT": "ECT", "SGT": "SGT", "WIT": "WIT", "IST": "IST", "CAT": "CAT", "COST": "COST", "HENOMX": "HENOMX", "HNCU": "HNCU", "AEDT": "AEDT", "ACDT": "ACDT", "GMT": "GMT", "HECU": "HECU", "MDT": "MDT", "LHDT": "LHDT", "∅∅∅": "∅∅∅", "LHST": "LHST", "NZDT": "NZDT", "BOT": "BOT", "ACST": "ACST", "WAST": "WAST", "CDT": "CDT", "MYT": "MYT", "WIB": "WIB", "HAT": "HAT", "HEOG": "HEOG", "CHAST": "CHAST", "CLST": "CLST", "HADT": "HADT", "WESZ": "WESZ", "ART": "ART", "AWST": "AWST", "OEZ": "OEZ", "WARST": "WARST", "COT": "COT", "AKST": "AKST", "AST": "AST", "HNT": "HNT", "HEPM": "HEPM"}, } } @@ -117,7 +123,7 @@ func (ig *ig) MonthNarrow(month time.Month) string { // MonthsNarrow returns the locales narrow months func (ig *ig) MonthsNarrow() []string { - return nil + return ig.monthsNarrow[1:] } // MonthWide returns the locales wide month given the 'month' provided @@ -173,13 +179,81 @@ func (ig *ig) WeekdaysWide() []string { // FmtNumber returns 'num' with digits/precision of 'v' for 'ig' and handles both Whole and Real numbers based on 'v' func (ig *ig) FmtNumber(num float64, v uint64) string { - return strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) + s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) + l := len(s) + 2 + 2*len(s[:len(s)-int(v)-1])/3 + count := 0 + inWhole := v == 0 + b := make([]byte, 0, l) + + for i := len(s) - 1; i >= 0; i-- { + + if s[i] == '.' { + for j := len(ig.decimal) - 1; j >= 0; j-- { + b = append(b, ig.decimal[j]) + } + inWhole = true + continue + } + + if inWhole { + if count == 3 { + for j := len(ig.group) - 1; j >= 0; j-- { + b = append(b, ig.group[j]) + } + count = 1 + } else { + count++ + } + } + + b = append(b, s[i]) + } + + if num < 0 { + b = append(b, ig.minus[0]) + } + + // reverse + for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { + b[i], b[j] = b[j], b[i] + } + + return string(b) } // FmtPercent returns 'num' with digits/precision of 'v' for 'ig' and handles both Whole and Real numbers based on 'v' // NOTE: 'num' passed into FmtPercent is assumed to be in percent already func (ig *ig) FmtPercent(num float64, v uint64) string { - return strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) + s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) + l := len(s) + 4 + b := make([]byte, 0, l) + + for i := len(s) - 1; i >= 0; i-- { + + if s[i] == '.' { + for j := len(ig.decimal) - 1; j >= 0; j-- { + b = append(b, ig.decimal[j]) + } + continue + } + + b = append(b, s[i]) + } + + if num < 0 { + b = append(b, ig.minus[0]) + } + + // reverse + for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { + b[i], b[j] = b[j], b[i] + } + + b = append(b, ig.percentSuffix...) + + b = append(b, ig.percent...) + + return string(b) } // FmtCurrency returns the currency representation of 'num' with digits/precision of 'v' for 'ig' @@ -187,7 +261,7 @@ func (ig *ig) FmtCurrency(num float64, v uint64, currency currency.Type) string s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) symbol := ig.currencies[currency] - l := len(s) + len(symbol) + 0 + 0*len(s[:len(s)-int(v)-1])/3 + l := len(s) + len(symbol) + 2 + 2*len(s[:len(s)-int(v)-1])/3 count := 0 inWhole := v == 0 b := make([]byte, 0, l) @@ -195,14 +269,18 @@ func (ig *ig) FmtCurrency(num float64, v uint64, currency currency.Type) string for i := len(s) - 1; i >= 0; i-- { if s[i] == '.' { - b = append(b, ig.decimal[0]) + for j := len(ig.decimal) - 1; j >= 0; j-- { + b = append(b, ig.decimal[j]) + } inWhole = true continue } if inWhole { if count == 3 { - b = append(b, ig.group[0]) + for j := len(ig.group) - 1; j >= 0; j-- { + b = append(b, ig.group[j]) + } count = 1 } else { count++ @@ -245,7 +323,7 @@ func (ig *ig) FmtAccounting(num float64, v uint64, currency currency.Type) strin s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) symbol := ig.currencies[currency] - l := len(s) + len(symbol) + 2 + 0*len(s[:len(s)-int(v)-1])/3 + l := len(s) + len(symbol) + 2 + 2*len(s[:len(s)-int(v)-1])/3 count := 0 inWhole := v == 0 b := make([]byte, 0, l) @@ -253,14 +331,18 @@ func (ig *ig) FmtAccounting(num float64, v uint64, currency currency.Type) strin for i := len(s) - 1; i >= 0; i-- { if s[i] == '.' { - b = append(b, ig.decimal[0]) + for j := len(ig.decimal) - 1; j >= 0; j-- { + b = append(b, ig.decimal[j]) + } inWhole = true continue } if inWhole { if count == 3 { - b = append(b, ig.group[0]) + for j := len(ig.group) - 1; j >= 0; j-- { + b = append(b, ig.group[j]) + } count = 1 } else { count++ @@ -276,7 +358,7 @@ func (ig *ig) FmtAccounting(num float64, v uint64, currency currency.Type) strin b = append(b, symbol[j]) } - b = append(b, ig.currencyNegativePrefix[0]) + b = append(b, ig.minus[0]) } else { @@ -302,10 +384,6 @@ func (ig *ig) FmtAccounting(num float64, v uint64, currency currency.Type) strin } } - if num < 0 { - b = append(b, ig.currencyNegativeSuffix...) - } - return string(b) } @@ -328,7 +406,12 @@ func (ig *ig) FmtDateShort(t time.Time) string { b = strconv.AppendInt(b, int64(t.Month()), 10) b = append(b, []byte{0x2f}...) - b = strconv.AppendInt(b, int64(t.Year()), 10) + + if t.Year() > 0 { + b = strconv.AppendInt(b, int64(t.Year()), 10) + } else { + b = strconv.AppendInt(b, int64(t.Year()*-1), 10) + } return string(b) } @@ -342,7 +425,12 @@ func (ig *ig) FmtDateMedium(t time.Time) string { b = append(b, []byte{0x20}...) b = append(b, ig.monthsAbbreviated[t.Month()]...) b = append(b, []byte{0x20}...) - b = strconv.AppendInt(b, int64(t.Year()), 10) + + if t.Year() > 0 { + b = strconv.AppendInt(b, int64(t.Year()), 10) + } else { + b = strconv.AppendInt(b, int64(t.Year()*-1), 10) + } return string(b) } @@ -356,7 +444,12 @@ func (ig *ig) FmtDateLong(t time.Time) string { b = append(b, []byte{0x20}...) b = append(b, ig.monthsWide[t.Month()]...) b = append(b, []byte{0x20}...) - b = strconv.AppendInt(b, int64(t.Year()), 10) + + if t.Year() > 0 { + b = strconv.AppendInt(b, int64(t.Year()), 10) + } else { + b = strconv.AppendInt(b, int64(t.Year()*-1), 10) + } return string(b) } @@ -372,7 +465,12 @@ func (ig *ig) FmtDateFull(t time.Time) string { b = append(b, []byte{0x20}...) b = append(b, ig.monthsWide[t.Month()]...) b = append(b, []byte{0x20}...) - b = strconv.AppendInt(b, int64(t.Year()), 10) + + if t.Year() > 0 { + b = strconv.AppendInt(b, int64(t.Year()), 10) + } else { + b = strconv.AppendInt(b, int64(t.Year()*-1), 10) + } return string(b) } @@ -382,13 +480,11 @@ func (ig *ig) FmtTimeShort(t time.Time) string { b := make([]byte, 0, 32) - h := t.Hour() - - if h > 12 { - h -= 12 + if t.Hour() < 10 { + b = append(b, '0') } - b = strconv.AppendInt(b, int64(h), 10) + b = strconv.AppendInt(b, int64(t.Hour()), 10) b = append(b, ig.timeSeparator...) if t.Minute() < 10 { @@ -396,13 +492,6 @@ func (ig *ig) FmtTimeShort(t time.Time) string { } b = strconv.AppendInt(b, int64(t.Minute()), 10) - b = append(b, []byte{0x20}...) - - if t.Hour() < 12 { - b = append(b, ig.periodsAbbreviated[0]...) - } else { - b = append(b, ig.periodsAbbreviated[1]...) - } return string(b) } @@ -412,13 +501,11 @@ func (ig *ig) FmtTimeMedium(t time.Time) string { b := make([]byte, 0, 32) - h := t.Hour() - - if h > 12 { - h -= 12 + if t.Hour() < 10 { + b = append(b, '0') } - b = strconv.AppendInt(b, int64(h), 10) + b = strconv.AppendInt(b, int64(t.Hour()), 10) b = append(b, ig.timeSeparator...) if t.Minute() < 10 { @@ -433,13 +520,6 @@ func (ig *ig) FmtTimeMedium(t time.Time) string { } b = strconv.AppendInt(b, int64(t.Second()), 10) - b = append(b, []byte{0x20}...) - - if t.Hour() < 12 { - b = append(b, ig.periodsAbbreviated[0]...) - } else { - b = append(b, ig.periodsAbbreviated[1]...) - } return string(b) } @@ -449,13 +529,11 @@ func (ig *ig) FmtTimeLong(t time.Time) string { b := make([]byte, 0, 32) - h := t.Hour() - - if h > 12 { - h -= 12 + if t.Hour() < 10 { + b = append(b, '0') } - b = strconv.AppendInt(b, int64(h), 10) + b = strconv.AppendInt(b, int64(t.Hour()), 10) b = append(b, ig.timeSeparator...) if t.Minute() < 10 { @@ -472,14 +550,6 @@ func (ig *ig) FmtTimeLong(t time.Time) string { b = strconv.AppendInt(b, int64(t.Second()), 10) b = append(b, []byte{0x20}...) - if t.Hour() < 12 { - b = append(b, ig.periodsAbbreviated[0]...) - } else { - b = append(b, ig.periodsAbbreviated[1]...) - } - - b = append(b, []byte{0x20}...) - tz, _ := t.Zone() b = append(b, tz...) @@ -491,13 +561,11 @@ func (ig *ig) FmtTimeFull(t time.Time) string { b := make([]byte, 0, 32) - h := t.Hour() - - if h > 12 { - h -= 12 + if t.Hour() < 10 { + b = append(b, '0') } - b = strconv.AppendInt(b, int64(h), 10) + b = strconv.AppendInt(b, int64(t.Hour()), 10) b = append(b, ig.timeSeparator...) if t.Minute() < 10 { @@ -514,14 +582,6 @@ func (ig *ig) FmtTimeFull(t time.Time) string { b = strconv.AppendInt(b, int64(t.Second()), 10) b = append(b, []byte{0x20}...) - if t.Hour() < 12 { - b = append(b, ig.periodsAbbreviated[0]...) - } else { - b = append(b, ig.periodsAbbreviated[1]...) - } - - b = append(b, []byte{0x20}...) - tz, _ := t.Zone() if btz, ok := ig.timezones[tz]; ok { -- cgit v1.2.3