add check for multibyte chars after switching from []byte to string

1 files changed, 12 insertions, 22 deletions

diff --git a/fr_MF/fr_MF.go b/fr_MF/fr_MF.go
index e6ea5b93..90b6ab23 100644
--- a/fr_MF/fr_MF.go
+++ b/fr_MF/fr_MF.go
@@ -18,7 +18,7 @@ type fr_MF struct {
 	group                  string
 	minus                  string
 	percent                string
-	percentSuffix          []byte
+	percentSuffix          string
 	perMille               string
 	timeSeparator          string
 	inifinity              string
@@ -58,7 +58,7 @@ func New() locales.Translator {
 		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 ", "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:          []byte{0xc2, 0xa0},
+		percentSuffix:          " ",
 		currencyPositiveSuffix: " ",
 		currencyNegativePrefix: "(",
 		currencyNegativeSuffix: " )",
@@ -75,7 +75,7 @@ func New() locales.Translator {
 		erasAbbreviated:        []string{"av. J.-C.", "ap. J.-C."},
 		erasNarrow:             []string{"av. J.-C.", "ap. J.-C."},
 		erasWide:               []string{"avant Jésus-Christ", "après Jésus-Christ"},
-		timezones:              map[string]string{"PDT": "heure d’été du Pacifique", "ART": "heure normale d’Argentine", "GFT": "heure de la Guyane française", "ChST": "heure des Chamorro", "HAST": "heure normale d’Hawaii - Aléoutiennes", "CAT": "heure normale d’Afrique centrale", "CST": "heure normale du centre nord-américain", "WARST": "heure d’été de l’Ouest argentin", "WAST": "heure d’été d’Afrique de l’Ouest", "ACDT": "heure d’été du centre de l’Australie", "PST": "heure normale du Pacifique nord-américain", "GMT": "heure moyenne de Greenwich", "AEST": "heure normale de l’Est de l’Australie", "LHDT": "heure d’été de Lord Howe", "AKDT": "heure d’été de l’Alaska", "EST": "heure normale de l’Est nord-américain", "WITA": "heure du Centre indonésien", "SGT": "heure de Singapour", "WESZ": "heure d’été d’Europe de l’Ouest", "AWDT": "heure d’été de l’Ouest de l’Australie", "UYST": "heure d’été de l’Uruguay", "BT": "heure du Bhoutan", "MYT": "heure de la Malaisie", "ECT": "heure de l’Équateur", "CLST": "heure d’été du Chili", "NZST": "heure normale de la Nouvelle-Zélande", "COST": "heure d’été de Colombie", "VET": "heure du Venezuela", "AWST": "heure normale de l’Ouest de l’Australie", "CLT": "heure normale du Chili", "UYT": "heure normale de l’Uruguay", "CHAST": "heure normale des îles Chatham", "COT": "heure normale de Colombie", "ACWST": "heure normale du centre-ouest de l’Australie", "ACWDT": "heure d’été du centre-ouest de l’Australie", "ARST": "heure d’été de l’Argentine", "MESZ": "heure d’été d’Europe centrale", "SAST": "heure normale d’Afrique méridionale", "TMT": "heure normale du Turkménistan", "CDT": "heure d’été du Centre", "WEZ": "heure normale d’Europe de l’Ouest", "GYT": "heure du Guyana", "SRT": "heure du Suriname", "∅∅∅": "heure d’été des Açores", "AEDT": "heure d’été de l’Est de l’Australie", "BOT": "heure de Bolivie", "MEZ": "heure normale d’Europe centrale", "ACST": "heure normale du centre de l’Australie", "JDT": "heure d’été du Japon", "LHST": "heure normale de Lord Howe", "HKT": "heure normale de Hong Kong", "MDT": "heure d’été de Macao", "OEZ": "heure normale d’Europe de l’Est", "JST": "heure normale du Japon", "IST": "heure de l’Inde", "MST": "heure normale de Macao", "WAT": "heure normale d’Afrique de l’Ouest", "HADT": "heure d’été d’Hawaii - Aléoutiennes", "EAT": "heure normale d’Afrique de l’Est", "WART": "heure normale de l’Ouest argentin", "EDT": "heure d’été de l’Est", "CHADT": "heure d’été des îles Chatham", "AST": "heure normale de l’Atlantique", "TMST": "heure d’été du Turkménistan", "HNT": "heure normale de Terre-Neuve", "HAT": "heure d’été de Terre-Neuve", "HKST": "heure d’été de Hong Kong", "OESZ": "heure d’été d’Europe de l’Est", "NZDT": "heure d’été de la Nouvelle-Zélande", "ADT": "heure d’été de l’Atlantique", "WIT": "heure de l’Est indonésien", "AKST": "heure normale de l’Alaska", "WIB": "heure de l’Ouest indonésien"},
+		timezones:              map[string]string{"GMT": "heure moyenne de Greenwich", "ACST": "heure normale du centre de l’Australie", "HAST": "heure normale d’Hawaii - Aléoutiennes", "COST": "heure d’été de Colombie", "WAT": "heure normale d’Afrique de l’Ouest", "MDT": "heure d’été de Macao", "SGT": "heure de Singapour", "CST": "heure normale du centre nord-américain", "CHAST": "heure normale des îles Chatham", "BT": "heure du Bhoutan", "WITA": "heure du Centre indonésien", "ECT": "heure de l’Équateur", "NZST": "heure normale de la Nouvelle-Zélande", "ACWDT": "heure d’été du centre-ouest de l’Australie", "MEZ": "heure normale d’Europe centrale", "WART": "heure normale de l’Ouest argentin", "HADT": "heure d’été d’Hawaii - Aléoutiennes", "LHDT": "heure d’été de Lord Howe", "SAST": "heure normale d’Afrique méridionale", "MST": "heure normale de Macao", "AWDT": "heure d’été de l’Ouest de l’Australie", "ARST": "heure d’été de l’Argentine", "WEZ": "heure normale d’Europe de l’Ouest", "JDT": "heure d’été du Japon", "VET": "heure du Venezuela", "HNT": "heure normale de Terre-Neuve", "HAT": "heure d’été de Terre-Neuve", "TMT": "heure normale du Turkménistan", "TMST": "heure d’été du Turkménistan", "EST": "heure normale de l’Est nord-américain", "AKDT": "heure d’été de l’Alaska", "ACWST": "heure normale du centre-ouest de l’Australie", "CLST": "heure d’été du Chili", "WARST": "heure d’été de l’Ouest argentin", "SRT": "heure du Suriname", "AWST": "heure normale de l’Ouest de l’Australie", "CAT": "heure normale d’Afrique centrale", "EDT": "heure d’été de l’Est", "AKST": "heure normale de l’Alaska", "COT": "heure normale de Colombie", "WIB": "heure de l’Ouest indonésien", "ACDT": "heure d’été du centre de l’Australie", "PST": "heure normale du Pacifique nord-américain", "HKST": "heure d’été de Hong Kong", "ADT": "heure d’été de l’Atlantique", "UYT": "heure normale de l’Uruguay", "GFT": "heure de la Guyane française", "ChST": "heure des Chamorro", "∅∅∅": "heure d’été de l’Amazonie", "MESZ": "heure d’été d’Europe centrale", "OESZ": "heure d’été d’Europe de l’Est", "AEST": "heure normale de l’Est de l’Australie", "GYT": "heure du Guyana", "LHST": "heure normale de Lord Howe", "OEZ": "heure normale d’Europe de l’Est", "CLT": "heure normale du Chili", "JST": "heure normale du Japon", "PDT": "heure d’été du Pacifique", "CDT": "heure d’été du Centre", "NZDT": "heure d’été de la Nouvelle-Zélande", "WAST": "heure d’été d’Afrique de l’Ouest", "CHADT": "heure d’été des îles Chatham", "AEDT": "heure d’été de l’Est de l’Australie", "BOT": "heure de Bolivie", "WIT": "heure de l’Est indonésien", "EAT": "heure normale d’Afrique de l’Est", "WESZ": "heure d’été d’Europe de l’Ouest", "IST": "heure de l’Inde", "UYST": "heure d’été de l’Uruguay", "ART": "heure normale d’Argentine", "AST": "heure normale de l’Atlantique", "MYT": "heure de la Malaisie", "HKT": "heure normale de Hong Kong"},
 	}
 }
 
@@ -211,7 +211,8 @@ func (fr *fr_MF) WeekdaysWide() []string {
 }
 
 // FmtNumber returns 'num' with digits/precision of 'v' for 'fr_MF' and handles both Whole and Real numbers based on 'v'
-func (fr *fr_MF) FmtNumber(num float64, v uint64) (results string) {
+func (fr *fr_MF) FmtNumber(num float64, v uint64) string {
+
 	s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64)
 	l := len(s) + len(fr.decimal) + len(fr.group)*len(s[:len(s)-int(v)-1])/3
 	count := 0
@@ -224,7 +225,6 @@ func (fr *fr_MF) FmtNumber(num float64, v uint64) (results string) {
 			for j := len(fr.decimal) - 1; j >= 0; j-- {
 				b = append(b, fr.decimal[j])
 			}
-
 			inWhole = true
 			continue
 		}
@@ -234,7 +234,6 @@ func (fr *fr_MF) FmtNumber(num float64, v uint64) (results string) {
 				for j := len(fr.group) - 1; j >= 0; j-- {
 					b = append(b, fr.group[j])
 				}
-
 				count = 1
 			} else {
 				count++
@@ -255,13 +254,12 @@ func (fr *fr_MF) FmtNumber(num float64, v uint64) (results string) {
 		b[i], b[j] = b[j], b[i]
 	}
 
-	results = string(b)
-	return
+	return string(b)
 }
 
 // FmtPercent returns 'num' with digits/precision of 'v' for 'fr_MF' and handles both Whole and Real numbers based on 'v'
 // NOTE: 'num' passed into FmtPercent is assumed to be in percent already
-func (fr *fr_MF) FmtPercent(num float64, v uint64) (results string) {
+func (fr *fr_MF) FmtPercent(num float64, v uint64) string {
 	s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64)
 	l := len(s) + len(fr.decimal)
 	b := make([]byte, 0, l)
@@ -272,7 +270,6 @@ func (fr *fr_MF) FmtPercent(num float64, v uint64) (results string) {
 			for j := len(fr.decimal) - 1; j >= 0; j-- {
 				b = append(b, fr.decimal[j])
 			}
-
 			continue
 		}
 
@@ -294,12 +291,11 @@ func (fr *fr_MF) FmtPercent(num float64, v uint64) (results string) {
 
 	b = append(b, fr.percent...)
 
-	results = string(b)
-	return
+	return string(b)
 }
 
 // FmtCurrency returns the currency representation of 'num' with digits/precision of 'v' for 'fr_MF'
-func (fr *fr_MF) FmtCurrency(num float64, v uint64, currency currency.Type) (results string) {
+func (fr *fr_MF) FmtCurrency(num float64, v uint64, currency currency.Type) string {
 
 	s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64)
 	symbol := fr.currencies[currency]
@@ -314,7 +310,6 @@ func (fr *fr_MF) FmtCurrency(num float64, v uint64, currency currency.Type) (res
 			for j := len(fr.decimal) - 1; j >= 0; j-- {
 				b = append(b, fr.decimal[j])
 			}
-
 			inWhole = true
 			continue
 		}
@@ -324,7 +319,6 @@ func (fr *fr_MF) FmtCurrency(num float64, v uint64, currency currency.Type) (res
 				for j := len(fr.group) - 1; j >= 0; j-- {
 					b = append(b, fr.group[j])
 				}
-
 				count = 1
 			} else {
 				count++
@@ -360,13 +354,12 @@ func (fr *fr_MF) FmtCurrency(num float64, v uint64, currency currency.Type) (res
 
 	b = append(b, symbol...)
 
-	results = string(b)
-	return
+	return string(b)
 }
 
 // FmtAccounting returns the currency representation of 'num' with digits/precision of 'v' for 'fr_MF'
 // in accounting notation.
-func (fr *fr_MF) FmtAccounting(num float64, v uint64, currency currency.Type) (results string) {
+func (fr *fr_MF) FmtAccounting(num float64, v uint64, currency currency.Type) string {
 
 	s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64)
 	symbol := fr.currencies[currency]
@@ -381,7 +374,6 @@ func (fr *fr_MF) FmtAccounting(num float64, v uint64, currency currency.Type) (r
 			for j := len(fr.decimal) - 1; j >= 0; j-- {
 				b = append(b, fr.decimal[j])
 			}
-
 			inWhole = true
 			continue
 		}
@@ -391,7 +383,6 @@ func (fr *fr_MF) FmtAccounting(num float64, v uint64, currency currency.Type) (r
 				for j := len(fr.group) - 1; j >= 0; j-- {
 					b = append(b, fr.group[j])
 				}
-
 				count = 1
 			} else {
 				count++
@@ -432,8 +423,7 @@ func (fr *fr_MF) FmtAccounting(num float64, v uint64, currency currency.Type) (r
 		b = append(b, symbol...)
 	}
 
-	results = string(b)
-	return
+	return string(b)
 }
 
 // FmtDateShort returns the short date representation of 't' for 'fr_MF'