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 --- nl_AW/nl_AW.go | 76 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 37 deletions(-) (limited to 'nl_AW') diff --git a/nl_AW/nl_AW.go b/nl_AW/nl_AW.go index d5135ba1..dfd74669 100644 --- a/nl_AW/nl_AW.go +++ b/nl_AW/nl_AW.go @@ -18,12 +18,12 @@ type nl_AW struct { group string minus string percent string + percentSuffix string perMille string timeSeparator string inifinity string currencies []string // idx = enum of currency code - currencyPositivePrefix string - currencyNegativePrefix string + currencyPositiveSuffix string currencyNegativeSuffix string monthsAbbreviated []string monthsNarrow []string @@ -56,10 +56,10 @@ func New() locales.Translator { perMille: "‰", timeSeparator: ":", inifinity: "∞", - currencies: []string{"ADP", "AED", "AFA", "AFN", "ALK", "ALL", "AMD", "ANG", "AOA", "AOK", "AON", "AOR", "ARA", "ARL", "ARM", "ARP", "ARS", "ATS", "AUD", "Afl.", "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", "NGN", "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"}, - currencyPositivePrefix: " ", - currencyNegativePrefix: "( ", - currencyNegativeSuffix: ")", + currencies: []string{"ADP", "AED", "AFA", "AFN", "ALK", "ALL", "AMD", "ANG", "AOA", "AOK", "AON", "AOR", "ARA", "ARL", "ARM", "ARP", "ARS", "ATS", "AUD", "Afl.", "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", "NGN", "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: " ", + currencyPositiveSuffix: " ", + currencyNegativeSuffix: " ", monthsAbbreviated: []string{"", "jan.", "feb.", "mrt.", "apr.", "mei", "jun.", "jul.", "aug.", "sep.", "okt.", "nov.", "dec."}, monthsNarrow: []string{"", "J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"}, monthsWide: []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}, @@ -73,7 +73,7 @@ func New() locales.Translator { erasAbbreviated: []string{"v.Chr.", "n.Chr."}, erasNarrow: []string{"v.C.", "n.C."}, erasWide: []string{"voor Christus", "na Christus"}, - timezones: map[string]string{"BOT": "Boliviaanse tijd", "HAT": "Newfoundland-zomertijd", "MEZ": "Midden-Europese standaardtijd", "ACWDT": "Midden-Australische westelijke zomertijd", "AEST": "Oost-Australische standaardtijd", "PST": "Pacific-standaardtijd", "AWST": "West-Australische standaardtijd", "CHAST": "Chatham-standaardtijd", "WIB": "West-Indonesische tijd", "HAST": "Hawaii-Aleoetische standaardtijd", "ART": "Argentijnse standaardtijd", "WART": "West-Argentijnse standaardtijd", "SAST": "Zuid-Afrikaanse tijd", "WAST": "West-Afrikaanse zomertijd", "MST": "Mountain-standaardtijd", "CHADT": "Chatham-zomertijd", "AEDT": "Oost-Australische zomertijd", "IST": "Indiase tijd", "ADT": "Atlantic-zomertijd", "CDT": "Central-zomertijd", "WESZ": "West-Europese zomertijd", "ACDT": "Midden-Australische zomertijd", "COST": "Colombiaanse zomertijd", "MDT": "Mountain-zomertijd", "HNT": "Newfoundland-standaardtijd", "AKDT": "Alaska-zomertijd", "EST": "Eastern-standaardtijd", "TMT": "Turkmeense standaardtijd", "WIT": "Oost-Indonesische tijd", "LHDT": "Lord Howe-eilandse zomertijd", "AST": "Atlantic-standaardtijd", "CST": "Central-standaardtijd", "BT": "Bhutaanse tijd", "UYT": "Uruguayaanse standaardtijd", "MESZ": "Midden-Europese zomertijd", "SGT": "Singaporese standaardtijd", "∅∅∅": "Azoren-zomertijd", "ARST": "Argentijnse zomertijd", "MYT": "Maleisische tijd", "NZDT": "Nieuw-Zeelandse zomertijd", "JST": "Japanse standaardtijd", "JDT": "Japanse zomertijd", "OEZ": "Oost-Europese standaardtijd", "ECT": "Ecuadoraanse tijd", "HADT": "Hawaii-Aleoetische zomertijd", "AKST": "Alaska-standaardtijd", "HKST": "Hongkongse zomertijd", "SRT": "Surinaamse tijd", "TMST": "Turkmeense zomertijd", "GMT": "Greenwich Mean Time", "WEZ": "West-Europese standaardtijd", "HKT": "Hongkongse standaardtijd", "WAT": "West-Afrikaanse standaardtijd", "UYST": "Uruguayaanse zomertijd", "COT": "Colombiaanse standaardtijd", "EAT": "Oost-Afrikaanse tijd", "EDT": "Eastern-zomertijd", "GYT": "Guyaanse tijd", "AWDT": "West-Australische zomertijd", "ChST": "Chamorro-tijd", "CAT": "Centraal-Afrikaanse tijd", "CLT": "Chileense standaardtijd", "VET": "Venezolaanse tijd", "ACWST": "Midden-Australische westelijke standaardtijd", "WITA": "Centraal-Indonesische tijd", "NZST": "Nieuw-Zeelandse standaardtijd", "CLST": "Chileense zomertijd", "OESZ": "Oost-Europese zomertijd", "GFT": "Frans-Guyaanse tijd", "WARST": "West-Argentijnse zomertijd", "PDT": "Pacific-zomertijd", "LHST": "Lord Howe-eilandse standaardtijd", "ACST": "Midden-Australische standaardtijd"}, + timezones: map[string]string{"AWDT": "West-Australische zomertijd", "MESZ": "Midden-Europese zomertijd", "BOT": "Boliviaanse tijd", "SGT": "Singaporese standaardtijd", "EST": "Eastern-standaardtijd", "CST": "Central-standaardtijd", "HEOG": "West-Groenlandse zomertijd", "ACST": "Midden-Australische standaardtijd", "OEZ": "Oost-Europese standaardtijd", "AKDT": "Alaska-zomertijd", "ADT": "Atlantic-zomertijd", "GYT": "Guyaanse tijd", "WIB": "West-Indonesische tijd", "PST": "Pacific-standaardtijd", "PDT": "Pacific-zomertijd", "AEST": "Oost-Australische standaardtijd", "JDT": "Japanse zomertijd", "ChST": "Chamorro-tijd", "GFT": "Frans-Guyaanse tijd", "TMST": "Turkmeense zomertijd", "CDT": "Central-zomertijd", "ART": "Argentijnse standaardtijd", "HKT": "Hongkongse standaardtijd", "HNPM": "Saint Pierre en Miquelon-standaardtijd", "HEPM": "Saint Pierre en Miquelon-zomertijd", "CLT": "Chileense standaardtijd", "ECT": "Ecuadoraanse tijd", "COT": "Colombiaanse standaardtijd", "HAST": "Hawaii-Aleoetische standaardtijd", "WEZ": "West-Europese standaardtijd", "HECU": "Cubaanse zomertijd", "EDT": "Eastern-zomertijd", "ACWDT": "Midden-Australische westelijke zomertijd", "ARST": "Argentijnse zomertijd", "CLST": "Chileense zomertijd", "SRT": "Surinaamse tijd", "AEDT": "Oost-Australische zomertijd", "∅∅∅": "Amazone-zomertijd", "WAT": "West-Afrikaanse standaardtijd", "OESZ": "Oost-Europese zomertijd", "GMT": "Greenwich Mean Time", "WART": "West-Argentijnse standaardtijd", "HAT": "Newfoundland-zomertijd", "IST": "Indiase tijd", "HEEG": "Oost-Groenlandse zomertijd", "ACDT": "Midden-Australische zomertijd", "MDT": "Macause zomertijd", "HEPMX": "Mexicaanse Pacific-zomertijd", "WESZ": "West-Europese zomertijd", "HKST": "Hongkongse zomertijd", "LHDT": "Lord Howe-eilandse zomertijd", "MST": "Macause standaardtijd", "MYT": "Maleisische tijd", "HNOG": "West-Groenlandse standaardtijd", "CHADT": "Chatham-zomertijd", "BT": "Bhutaanse tijd", "CHAST": "Chatham-standaardtijd", "HNEG": "Oost-Groenlandse standaardtijd", "COST": "Colombiaanse zomertijd", "HNNOMX": "Noordwest-Mexicaanse standaardtijd", "HNCU": "Cubaanse standaardtijd", "UYT": "Uruguayaanse standaardtijd", "ACWST": "Midden-Australische westelijke standaardtijd", "MEZ": "Midden-Europese standaardtijd", "LHST": "Lord Howe-eilandse standaardtijd", "WAST": "West-Afrikaanse zomertijd", "WARST": "West-Argentijnse zomertijd", "HADT": "Hawaii-Aleoetische zomertijd", "AWST": "West-Australische standaardtijd", "TMT": "Turkmeense standaardtijd", "CAT": "Centraal-Afrikaanse tijd", "EAT": "Oost-Afrikaanse tijd", "HENOMX": "Noordwest-Mexicaanse zomertijd", "UYST": "Uruguayaanse zomertijd", "VET": "Venezolaanse tijd", "HNT": "Newfoundland-standaardtijd", "NZST": "Nieuw-Zeelandse standaardtijd", "NZDT": "Nieuw-Zeelandse zomertijd", "SAST": "Zuid-Afrikaanse tijd", "AKST": "Alaska-standaardtijd", "WITA": "Centraal-Indonesische tijd", "JST": "Japanse standaardtijd", "HNPMX": "Mexicaanse Pacific-standaardtijd", "AST": "Atlantic-standaardtijd", "WIT": "Oost-Indonesische tijd"}, } } @@ -246,7 +246,7 @@ func (nl *nl_AW) FmtNumber(num float64, v uint64) string { // NOTE: 'num' passed into FmtPercent is assumed to be in percent already func (nl *nl_AW) FmtPercent(num float64, v uint64) string { s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) - l := len(s) + 3 + l := len(s) + 5 b := make([]byte, 0, l) for i := len(s) - 1; i >= 0; i-- { @@ -268,6 +268,8 @@ func (nl *nl_AW) FmtPercent(num float64, v uint64) string { b[i], b[j] = b[j], b[i] } + b = append(b, nl.percentSuffix...) + b = append(b, nl.percent...) return string(b) @@ -303,14 +305,6 @@ func (nl *nl_AW) FmtCurrency(num float64, v uint64, currency currency.Type) stri b = append(b, s[i]) } - for j := len(symbol) - 1; j >= 0; j-- { - b = append(b, symbol[j]) - } - - for j := len(nl.currencyPositivePrefix) - 1; j >= 0; j-- { - b = append(b, nl.currencyPositivePrefix[j]) - } - if num < 0 { b = append(b, nl.minus[0]) } @@ -331,6 +325,10 @@ func (nl *nl_AW) FmtCurrency(num float64, v uint64, currency currency.Type) stri } } + b = append(b, nl.currencyPositiveSuffix...) + + b = append(b, symbol...) + return string(b) } @@ -340,7 +338,7 @@ func (nl *nl_AW) FmtAccounting(num float64, v uint64, currency currency.Type) st s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) symbol := nl.currencies[currency] - l := len(s) + len(symbol) + 6 + 1*len(s[:len(s)-int(v)-1])/3 + l := len(s) + len(symbol) + 4 + 1*len(s[:len(s)-int(v)-1])/3 count := 0 inWhole := v == 0 b := make([]byte, 0, l) @@ -367,23 +365,7 @@ func (nl *nl_AW) FmtAccounting(num float64, v uint64, currency currency.Type) st if num < 0 { - for j := len(symbol) - 1; j >= 0; j-- { - b = append(b, symbol[j]) - } - - for j := len(nl.currencyNegativePrefix) - 1; j >= 0; j-- { - b = append(b, nl.currencyNegativePrefix[j]) - } - - } else { - - for j := len(symbol) - 1; j >= 0; j-- { - b = append(b, symbol[j]) - } - - for j := len(nl.currencyPositivePrefix) - 1; j >= 0; j-- { - b = append(b, nl.currencyPositivePrefix[j]) - } + b = append(b, nl.minus[0]) } @@ -405,6 +387,11 @@ func (nl *nl_AW) FmtAccounting(num float64, v uint64, currency currency.Type) st if num < 0 { b = append(b, nl.currencyNegativeSuffix...) + b = append(b, symbol...) + } else { + + b = append(b, nl.currencyPositiveSuffix...) + b = append(b, symbol...) } return string(b) @@ -448,7 +435,12 @@ func (nl *nl_AW) FmtDateMedium(t time.Time) string { b = append(b, []byte{0x20}...) b = append(b, nl.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) } @@ -462,7 +454,12 @@ func (nl *nl_AW) FmtDateLong(t time.Time) string { b = append(b, []byte{0x20}...) b = append(b, nl.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) } @@ -478,7 +475,12 @@ func (nl *nl_AW) FmtDateFull(t time.Time) string { b = append(b, []byte{0x20}...) b = append(b, nl.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) } -- cgit v1.2.3