diff options
560 files changed, 1151 insertions, 969 deletions
@@ -148,7 +148,7 @@ func (af *af) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, af.Percent[0]) + b = append(b, af.percent...) return b } diff --git a/af_NA/af_NA.go b/af_NA/af_NA.go index 1df2e21a..a8cbb300 100644 --- a/af_NA/af_NA.go +++ b/af_NA/af_NA.go @@ -148,7 +148,7 @@ func (af *af_NA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, af.Percent[0]) + b = append(b, af.percent...) return b } diff --git a/af_ZA/af_ZA.go b/af_ZA/af_ZA.go index e7a5acdc..f537313e 100644 --- a/af_ZA/af_ZA.go +++ b/af_ZA/af_ZA.go @@ -148,7 +148,7 @@ func (af *af_ZA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, af.Percent[0]) + b = append(b, af.percent...) return b } @@ -145,9 +145,7 @@ func (agq *agq) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(agq.percent) - 1; j >= 0; j-- { - b = append(b, agq.percent[j]) - } + b = append(b, agq.percent...) return b } diff --git a/agq_CM/agq_CM.go b/agq_CM/agq_CM.go index 0644acac..d09e3ec1 100644 --- a/agq_CM/agq_CM.go +++ b/agq_CM/agq_CM.go @@ -145,9 +145,7 @@ func (agq *agq_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(agq.percent) - 1; j >= 0; j-- { - b = append(b, agq.percent[j]) - } + b = append(b, agq.percent...) return b } @@ -157,7 +157,7 @@ func (am *am) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, am.Percent[0]) + b = append(b, am.percent...) return b } diff --git a/am_ET/am_ET.go b/am_ET/am_ET.go index 803fdc46..b30b85fc 100644 --- a/am_ET/am_ET.go +++ b/am_ET/am_ET.go @@ -157,7 +157,7 @@ func (am *am_ET) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, am.Percent[0]) + b = append(b, am.percent...) return b } @@ -218,9 +218,7 @@ func (ar *ar) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_001/ar_001.go b/ar_001/ar_001.go index ad902289..3a6e19a8 100644 --- a/ar_001/ar_001.go +++ b/ar_001/ar_001.go @@ -218,9 +218,7 @@ func (ar *ar_001) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_AE/ar_AE.go b/ar_AE/ar_AE.go index 299eb370..cea77333 100644 --- a/ar_AE/ar_AE.go +++ b/ar_AE/ar_AE.go @@ -218,9 +218,7 @@ func (ar *ar_AE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_BH/ar_BH.go b/ar_BH/ar_BH.go index 27d09f22..74cb9e3b 100644 --- a/ar_BH/ar_BH.go +++ b/ar_BH/ar_BH.go @@ -218,9 +218,7 @@ func (ar *ar_BH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_DJ/ar_DJ.go b/ar_DJ/ar_DJ.go index e84f438b..af92844b 100644 --- a/ar_DJ/ar_DJ.go +++ b/ar_DJ/ar_DJ.go @@ -218,9 +218,7 @@ func (ar *ar_DJ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_DZ/ar_DZ.go b/ar_DZ/ar_DZ.go index cece33ac..39bf8547 100644 --- a/ar_DZ/ar_DZ.go +++ b/ar_DZ/ar_DZ.go @@ -209,9 +209,7 @@ func (ar *ar_DZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_EG/ar_EG.go b/ar_EG/ar_EG.go index 6394c1f8..2a234cab 100644 --- a/ar_EG/ar_EG.go +++ b/ar_EG/ar_EG.go @@ -218,9 +218,7 @@ func (ar *ar_EG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_EH/ar_EH.go b/ar_EH/ar_EH.go index 297ed62d..54a3de2c 100644 --- a/ar_EH/ar_EH.go +++ b/ar_EH/ar_EH.go @@ -218,9 +218,7 @@ func (ar *ar_EH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_ER/ar_ER.go b/ar_ER/ar_ER.go index f35139af..e8c5be78 100644 --- a/ar_ER/ar_ER.go +++ b/ar_ER/ar_ER.go @@ -218,9 +218,7 @@ func (ar *ar_ER) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_IL/ar_IL.go b/ar_IL/ar_IL.go index 8c377467..c1d76708 100644 --- a/ar_IL/ar_IL.go +++ b/ar_IL/ar_IL.go @@ -218,9 +218,7 @@ func (ar *ar_IL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_IQ/ar_IQ.go b/ar_IQ/ar_IQ.go index 5e9df503..04af5eed 100644 --- a/ar_IQ/ar_IQ.go +++ b/ar_IQ/ar_IQ.go @@ -218,9 +218,7 @@ func (ar *ar_IQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_JO/ar_JO.go b/ar_JO/ar_JO.go index 40e8f51a..ca99e47f 100644 --- a/ar_JO/ar_JO.go +++ b/ar_JO/ar_JO.go @@ -218,9 +218,7 @@ func (ar *ar_JO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_KM/ar_KM.go b/ar_KM/ar_KM.go index 2262a8de..912633aa 100644 --- a/ar_KM/ar_KM.go +++ b/ar_KM/ar_KM.go @@ -218,9 +218,7 @@ func (ar *ar_KM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_KW/ar_KW.go b/ar_KW/ar_KW.go index 61a90493..856f2067 100644 --- a/ar_KW/ar_KW.go +++ b/ar_KW/ar_KW.go @@ -218,9 +218,7 @@ func (ar *ar_KW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_LB/ar_LB.go b/ar_LB/ar_LB.go index 3b53342e..01441d93 100644 --- a/ar_LB/ar_LB.go +++ b/ar_LB/ar_LB.go @@ -209,9 +209,7 @@ func (ar *ar_LB) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_LY/ar_LY.go b/ar_LY/ar_LY.go index 2a64731b..0ca07744 100644 --- a/ar_LY/ar_LY.go +++ b/ar_LY/ar_LY.go @@ -209,9 +209,7 @@ func (ar *ar_LY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_MA/ar_MA.go b/ar_MA/ar_MA.go index a248e31f..4f6e0a9c 100644 --- a/ar_MA/ar_MA.go +++ b/ar_MA/ar_MA.go @@ -209,9 +209,7 @@ func (ar *ar_MA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_MR/ar_MR.go b/ar_MR/ar_MR.go index 4f62d703..78d6bccc 100644 --- a/ar_MR/ar_MR.go +++ b/ar_MR/ar_MR.go @@ -209,9 +209,7 @@ func (ar *ar_MR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_OM/ar_OM.go b/ar_OM/ar_OM.go index 2fbc66d1..e5f8a04c 100644 --- a/ar_OM/ar_OM.go +++ b/ar_OM/ar_OM.go @@ -218,9 +218,7 @@ func (ar *ar_OM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_PS/ar_PS.go b/ar_PS/ar_PS.go index 44760a7b..f06a8e21 100644 --- a/ar_PS/ar_PS.go +++ b/ar_PS/ar_PS.go @@ -218,9 +218,7 @@ func (ar *ar_PS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_QA/ar_QA.go b/ar_QA/ar_QA.go index 326a5a3c..37553b04 100644 --- a/ar_QA/ar_QA.go +++ b/ar_QA/ar_QA.go @@ -218,9 +218,7 @@ func (ar *ar_QA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_SA/ar_SA.go b/ar_SA/ar_SA.go index b53a457d..39d93767 100644 --- a/ar_SA/ar_SA.go +++ b/ar_SA/ar_SA.go @@ -218,9 +218,7 @@ func (ar *ar_SA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_SD/ar_SD.go b/ar_SD/ar_SD.go index 2975a539..c063fe6b 100644 --- a/ar_SD/ar_SD.go +++ b/ar_SD/ar_SD.go @@ -218,9 +218,7 @@ func (ar *ar_SD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_SO/ar_SO.go b/ar_SO/ar_SO.go index b76299c5..e9a76ac7 100644 --- a/ar_SO/ar_SO.go +++ b/ar_SO/ar_SO.go @@ -218,9 +218,7 @@ func (ar *ar_SO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_SS/ar_SS.go b/ar_SS/ar_SS.go index c1f876a6..4bc0a679 100644 --- a/ar_SS/ar_SS.go +++ b/ar_SS/ar_SS.go @@ -218,9 +218,7 @@ func (ar *ar_SS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_SY/ar_SY.go b/ar_SY/ar_SY.go index d774b796..116edea1 100644 --- a/ar_SY/ar_SY.go +++ b/ar_SY/ar_SY.go @@ -218,9 +218,7 @@ func (ar *ar_SY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_TD/ar_TD.go b/ar_TD/ar_TD.go index 4c8b4e8a..43905be0 100644 --- a/ar_TD/ar_TD.go +++ b/ar_TD/ar_TD.go @@ -218,9 +218,7 @@ func (ar *ar_TD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_TN/ar_TN.go b/ar_TN/ar_TN.go index 166daf08..d86de884 100644 --- a/ar_TN/ar_TN.go +++ b/ar_TN/ar_TN.go @@ -209,9 +209,7 @@ func (ar *ar_TN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } diff --git a/ar_YE/ar_YE.go b/ar_YE/ar_YE.go index 11a77ddf..d0afabb8 100644 --- a/ar_YE/ar_YE.go +++ b/ar_YE/ar_YE.go @@ -218,9 +218,7 @@ func (ar *ar_YE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ar.percent) - 1; j >= 0; j-- { - b = append(b, ar.percent[j]) - } + b = append(b, ar.percent...) return b } @@ -181,9 +181,7 @@ func (as *as) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(as.percent) - 1; j >= 0; j-- { - b = append(b, as.percent[j]) - } + b = append(b, as.percent...) return b } diff --git a/as_IN/as_IN.go b/as_IN/as_IN.go index 586e2c47..39b7ebe7 100644 --- a/as_IN/as_IN.go +++ b/as_IN/as_IN.go @@ -181,9 +181,7 @@ func (as *as_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(as.percent) - 1; j >= 0; j-- { - b = append(b, as.percent[j]) - } + b = append(b, as.percent...) return b } @@ -159,9 +159,7 @@ func (ast *ast) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ast.percent) - 1; j >= 0; j-- { - b = append(b, ast.percent[j]) - } + b = append(b, ast.percent...) return b } diff --git a/ast_ES/ast_ES.go b/ast_ES/ast_ES.go index 7f13a465..9a8081ec 100644 --- a/ast_ES/ast_ES.go +++ b/ast_ES/ast_ES.go @@ -159,9 +159,7 @@ func (ast *ast_ES) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ast.percent) - 1; j >= 0; j-- { - b = append(b, ast.percent[j]) - } + b = append(b, ast.percent...) return b } @@ -66,9 +66,9 @@ func (az *az) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) + iMod1000 := i % 1000 iMod10 := i % 10 iMod100 := i % 100 - iMod1000 := i % 1000 if (iMod10 == 1 || iMod10 == 2 || iMod10 == 5 || iMod10 == 7 || iMod10 == 8) || (iMod100 == 20 || iMod100 == 50 || iMod100 == 70 || iMod100 == 80) { return locales.PluralRuleOne @@ -171,7 +171,7 @@ func (az *az) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, az.Percent[0]) + b = append(b, az.percent...) return b } diff --git a/az_Cyrl/az_Cyrl.go b/az_Cyrl/az_Cyrl.go index e5fff26d..d5785c80 100644 --- a/az_Cyrl/az_Cyrl.go +++ b/az_Cyrl/az_Cyrl.go @@ -66,9 +66,9 @@ func (az *az_Cyrl) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) + iMod1000 := i % 1000 iMod10 := i % 10 iMod100 := i % 100 - iMod1000 := i % 1000 if (iMod10 == 1 || iMod10 == 2 || iMod10 == 5 || iMod10 == 7 || iMod10 == 8) || (iMod100 == 20 || iMod100 == 50 || iMod100 == 70 || iMod100 == 80) { return locales.PluralRuleOne @@ -171,7 +171,7 @@ func (az *az_Cyrl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, az.Percent[0]) + b = append(b, az.percent...) return b } diff --git a/az_Cyrl_AZ/az_Cyrl_AZ.go b/az_Cyrl_AZ/az_Cyrl_AZ.go index f013e7bf..f6f8fd06 100644 --- a/az_Cyrl_AZ/az_Cyrl_AZ.go +++ b/az_Cyrl_AZ/az_Cyrl_AZ.go @@ -171,7 +171,7 @@ func (az *az_Cyrl_AZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, az.Percent[0]) + b = append(b, az.percent...) return b } diff --git a/az_Latn/az_Latn.go b/az_Latn/az_Latn.go index dbc85a8e..82814f98 100644 --- a/az_Latn/az_Latn.go +++ b/az_Latn/az_Latn.go @@ -171,7 +171,7 @@ func (az *az_Latn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, az.Percent[0]) + b = append(b, az.percent...) return b } diff --git a/az_Latn_AZ/az_Latn_AZ.go b/az_Latn_AZ/az_Latn_AZ.go index 55a82367..78244b6c 100644 --- a/az_Latn_AZ/az_Latn_AZ.go +++ b/az_Latn_AZ/az_Latn_AZ.go @@ -66,9 +66,9 @@ func (az *az_Latn_AZ) OrdinalPluralRule(num float64, v uint64) locales.PluralRul n := math.Abs(num) i := int64(n) - iMod10 := i % 10 iMod100 := i % 100 iMod1000 := i % 1000 + iMod10 := i % 10 if (iMod10 == 1 || iMod10 == 2 || iMod10 == 5 || iMod10 == 7 || iMod10 == 8) || (iMod100 == 20 || iMod100 == 50 || iMod100 == 70 || iMod100 == 80) { return locales.PluralRuleOne @@ -171,7 +171,7 @@ func (az *az_Latn_AZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, az.Percent[0]) + b = append(b, az.percent...) return b } @@ -145,9 +145,9 @@ func (bas *bas) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bas.percent) - 1; j >= 0; j-- { - b = append(b, bas.percent[j]) - } + b = append(b, " "...) + + b = append(b, bas.percent...) return b } diff --git a/bas_CM/bas_CM.go b/bas_CM/bas_CM.go index cf506cf3..5b03065b 100644 --- a/bas_CM/bas_CM.go +++ b/bas_CM/bas_CM.go @@ -145,9 +145,9 @@ func (bas *bas_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bas.percent) - 1; j >= 0; j-- { - b = append(b, bas.percent[j]) - } + b = append(b, " "...) + + b = append(b, bas.percent...) return b } @@ -53,8 +53,8 @@ func (be *be) PluralsOrdinal() []locales.PluralRule { func (be *be) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -71,8 +71,8 @@ func (be *be) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (be *be) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if (nMod10 == 2 || nMod10 == 3) && (nMod100 != 12 && nMod100 != 13) { return locales.PluralRuleFew @@ -163,7 +163,9 @@ func (be *be) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, be.Percent[0]) + b = append(b, " "...) + + b = append(b, be.percent...) return b } diff --git a/be_BY/be_BY.go b/be_BY/be_BY.go index 8eea4faa..dcedec85 100644 --- a/be_BY/be_BY.go +++ b/be_BY/be_BY.go @@ -71,8 +71,8 @@ func (be *be_BY) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (be *be_BY) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if (nMod10 == 2 || nMod10 == 3) && (nMod100 != 12 && nMod100 != 13) { return locales.PluralRuleFew @@ -163,7 +163,9 @@ func (be *be_BY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, be.Percent[0]) + b = append(b, " "...) + + b = append(b, be.percent...) return b } @@ -148,7 +148,7 @@ func (bg *bg) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bg.Percent[0]) + b = append(b, bg.percent...) return b } diff --git a/bg_BG/bg_BG.go b/bg_BG/bg_BG.go index dc643ecf..ee4f45e4 100644 --- a/bg_BG/bg_BG.go +++ b/bg_BG/bg_BG.go @@ -148,7 +148,7 @@ func (bg *bg_BG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bg.Percent[0]) + b = append(b, bg.percent...) return b } @@ -192,9 +192,7 @@ func (bn *bn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bn.percent) - 1; j >= 0; j-- { - b = append(b, bn.percent[j]) - } + b = append(b, bn.percent...) return b } diff --git a/bn_BD/bn_BD.go b/bn_BD/bn_BD.go index 45a715d8..db114963 100644 --- a/bn_BD/bn_BD.go +++ b/bn_BD/bn_BD.go @@ -192,9 +192,7 @@ func (bn *bn_BD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bn.percent) - 1; j >= 0; j-- { - b = append(b, bn.percent[j]) - } + b = append(b, bn.percent...) return b } diff --git a/bn_IN/bn_IN.go b/bn_IN/bn_IN.go index 8a7b447d..64a97177 100644 --- a/bn_IN/bn_IN.go +++ b/bn_IN/bn_IN.go @@ -192,9 +192,7 @@ func (bn *bn_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bn.percent) - 1; j >= 0; j-- { - b = append(b, bn.percent[j]) - } + b = append(b, bn.percent...) return b } @@ -142,9 +142,7 @@ func (bo *bo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bo.percent) - 1; j >= 0; j-- { - b = append(b, bo.percent[j]) - } + b = append(b, bo.percent...) return b } diff --git a/bo_CN/bo_CN.go b/bo_CN/bo_CN.go index f5b80d4e..83ed57e4 100644 --- a/bo_CN/bo_CN.go +++ b/bo_CN/bo_CN.go @@ -142,9 +142,7 @@ func (bo *bo_CN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bo.percent) - 1; j >= 0; j-- { - b = append(b, bo.percent[j]) - } + b = append(b, bo.percent...) return b } diff --git a/bo_IN/bo_IN.go b/bo_IN/bo_IN.go index fa80e21d..65a9f712 100644 --- a/bo_IN/bo_IN.go +++ b/bo_IN/bo_IN.go @@ -142,9 +142,7 @@ func (bo *bo_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(bo.percent) - 1; j >= 0; j-- { - b = append(b, bo.percent[j]) - } + b = append(b, bo.percent...) return b } @@ -167,9 +167,9 @@ func (br *br) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(br.percent) - 1; j >= 0; j-- { - b = append(b, br.percent[j]) - } + b = append(b, " "...) + + b = append(b, br.percent...) return b } diff --git a/br_FR/br_FR.go b/br_FR/br_FR.go index c4b2121c..2c4553f2 100644 --- a/br_FR/br_FR.go +++ b/br_FR/br_FR.go @@ -53,9 +53,9 @@ func (br *br_FR) PluralsOrdinal() []locales.PluralRule { func (br *br_FR) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) + nMod1000000 := math.Mod(n, 1000000) nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) - nMod1000000 := math.Mod(n, 1000000) if nMod10 == 1 && (nMod100 != 11 && nMod100 != 71 && nMod100 != 91) { return locales.PluralRuleOne @@ -167,9 +167,9 @@ func (br *br_FR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(br.percent) - 1; j >= 0; j-- { - b = append(b, br.percent[j]) - } + b = append(b, " "...) + + b = append(b, br.percent...) return b } @@ -154,7 +154,7 @@ func (brx *brx) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, brx.Percent[0]) + b = append(b, brx.percent...) return b } diff --git a/brx_IN/brx_IN.go b/brx_IN/brx_IN.go index 3ab1131e..ddc006cc 100644 --- a/brx_IN/brx_IN.go +++ b/brx_IN/brx_IN.go @@ -154,7 +154,7 @@ func (brx *brx_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, brx.Percent[0]) + b = append(b, brx.percent...) return b } @@ -57,8 +57,8 @@ func (bs *bs) CardinalPluralRule(num float64, v uint64) locales.PluralRule { f := locales.F(n, v) iMod10 := i % 10 iMod100 := i % 100 - fMod10 := f % 10 fMod100 := f % 100 + fMod10 := f % 10 if (v == 0 && iMod10 == 1 && iMod100 != 11) || (fMod10 == 1 && fMod100 != 11) { return locales.PluralRuleOne @@ -176,7 +176,7 @@ func (bs *bs) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bs.Percent[0]) + b = append(b, bs.percent...) return b } diff --git a/bs_Cyrl/bs_Cyrl.go b/bs_Cyrl/bs_Cyrl.go index 3f100b3b..4dcc49da 100644 --- a/bs_Cyrl/bs_Cyrl.go +++ b/bs_Cyrl/bs_Cyrl.go @@ -176,7 +176,7 @@ func (bs *bs_Cyrl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bs.Percent[0]) + b = append(b, bs.percent...) return b } diff --git a/bs_Cyrl_BA/bs_Cyrl_BA.go b/bs_Cyrl_BA/bs_Cyrl_BA.go index 5eac1233..11527bf3 100644 --- a/bs_Cyrl_BA/bs_Cyrl_BA.go +++ b/bs_Cyrl_BA/bs_Cyrl_BA.go @@ -176,7 +176,7 @@ func (bs *bs_Cyrl_BA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bs.Percent[0]) + b = append(b, bs.percent...) return b } diff --git a/bs_Latn/bs_Latn.go b/bs_Latn/bs_Latn.go index c1f5385a..4145c242 100644 --- a/bs_Latn/bs_Latn.go +++ b/bs_Latn/bs_Latn.go @@ -176,7 +176,7 @@ func (bs *bs_Latn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bs.Percent[0]) + b = append(b, bs.percent...) return b } diff --git a/bs_Latn_BA/bs_Latn_BA.go b/bs_Latn_BA/bs_Latn_BA.go index cf22b3ef..1c96f3b5 100644 --- a/bs_Latn_BA/bs_Latn_BA.go +++ b/bs_Latn_BA/bs_Latn_BA.go @@ -55,10 +55,10 @@ func (bs *bs_Latn_BA) CardinalPluralRule(num float64, v uint64) locales.PluralRu n := math.Abs(num) i := int64(n) f := locales.F(n, v) - iMod100 := i % 100 iMod10 := i % 10 - fMod10 := f % 10 + iMod100 := i % 100 fMod100 := f % 100 + fMod10 := f % 10 if (v == 0 && iMod10 == 1 && iMod100 != 11) || (fMod10 == 1 && fMod100 != 11) { return locales.PluralRuleOne @@ -176,7 +176,7 @@ func (bs *bs_Latn_BA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, bs.Percent[0]) + b = append(b, bs.percent...) return b } @@ -157,7 +157,7 @@ func (ca *ca) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ca.Percent[0]) + b = append(b, ca.percent...) return b } diff --git a/ca_AD/ca_AD.go b/ca_AD/ca_AD.go index 67de48df..447a85b7 100644 --- a/ca_AD/ca_AD.go +++ b/ca_AD/ca_AD.go @@ -157,7 +157,7 @@ func (ca *ca_AD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ca.Percent[0]) + b = append(b, ca.percent...) return b } diff --git a/ca_ES/ca_ES.go b/ca_ES/ca_ES.go index b161ba11..c69777cc 100644 --- a/ca_ES/ca_ES.go +++ b/ca_ES/ca_ES.go @@ -157,7 +157,7 @@ func (ca *ca_ES) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ca.Percent[0]) + b = append(b, ca.percent...) return b } diff --git a/ca_ES_VALENCIA/ca_ES_VALENCIA.go b/ca_ES_VALENCIA/ca_ES_VALENCIA.go index db57c47c..77379e15 100644 --- a/ca_ES_VALENCIA/ca_ES_VALENCIA.go +++ b/ca_ES_VALENCIA/ca_ES_VALENCIA.go @@ -157,7 +157,7 @@ func (ca *ca_ES_VALENCIA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ca.Percent[0]) + b = append(b, ca.percent...) return b } diff --git a/ca_FR/ca_FR.go b/ca_FR/ca_FR.go index 96e08e78..90d2accd 100644 --- a/ca_FR/ca_FR.go +++ b/ca_FR/ca_FR.go @@ -157,7 +157,7 @@ func (ca *ca_FR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ca.Percent[0]) + b = append(b, ca.percent...) return b } diff --git a/ca_IT/ca_IT.go b/ca_IT/ca_IT.go index 4e646228..0584afa1 100644 --- a/ca_IT/ca_IT.go +++ b/ca_IT/ca_IT.go @@ -157,7 +157,7 @@ func (ca *ca_IT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ca.Percent[0]) + b = append(b, ca.percent...) return b } @@ -145,7 +145,9 @@ func (ce *ce) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ce.Percent[0]) + b = append(b, " "...) + + b = append(b, ce.percent...) return b } diff --git a/ce_RU/ce_RU.go b/ce_RU/ce_RU.go index 171be6db..44305513 100644 --- a/ce_RU/ce_RU.go +++ b/ce_RU/ce_RU.go @@ -145,7 +145,9 @@ func (ce *ce_RU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ce.Percent[0]) + b = append(b, " "...) + + b = append(b, ce.percent...) return b } @@ -145,7 +145,7 @@ func (chr *chr) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, chr.Percent[0]) + b = append(b, chr.percent...) return b } diff --git a/chr_US/chr_US.go b/chr_US/chr_US.go index 0df2c6ae..3950b64a 100644 --- a/chr_US/chr_US.go +++ b/chr_US/chr_US.go @@ -145,7 +145,7 @@ func (chr *chr_US) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, chr.Percent[0]) + b = append(b, chr.percent...) return b } diff --git a/cmd/generate_resources.go b/cmd/generate_resources.go index a8b08481..ad7cba87 100644 --- a/cmd/generate_resources.go +++ b/cmd/generate_resources.go @@ -43,6 +43,7 @@ var ( fModRegex = regexp.MustCompile("(f%[0-9]+)") tModRegex = regexp.MustCompile("(t%[0-9]+)") groupLenRegex = regexp.MustCompile(",([0-9#]+)\\.") + groupLenPercentRegex = regexp.MustCompile(",([0-9#]+)$") secondaryGroupLenRegex = regexp.MustCompile(",([0-9#]+),") requiredNumRegex = regexp.MustCompile("([0-9]+)\\.") requiredDecimalRegex = regexp.MustCompile("\\.([0-9]+)") @@ -79,6 +80,9 @@ type translator struct { FmtPercentGroupLen int FmtPercentSecondaryGroupLen int FmtPercentMinDecimalLen int + FmtPercentPrefix string + FmtPercentSuffix string + FmtPercentInPrefix bool FmtPercentLeft bool // calculation only fields @@ -145,7 +149,7 @@ func main() { for _, trans := range translators { - fmt.Println("Writing Data:", trans.Locale) + fmt.Println("Writing Data:", trans.PercentNumberFormat, len(trans.FmtPercentPrefix), trans.FmtPercentPrefix, len(trans.FmtPercentSuffix), trans.FmtPercentSuffix, trans.Locale) if err = os.MkdirAll(fmt.Sprintf(locDir, trans.Locale), 0777); err != nil { log.Fatal(err) @@ -463,40 +467,95 @@ func parsePercentNumberFormat(trans *translator) (results string) { trans.FmtPercentExists = true - formats := strings.SplitN(trans.PercentNumberFormat, ";", 2) + // formats := strings.SplitN(trans.PercentNumberFormat, ";", 2) // if len(formats) > 1 { // trans.FmtNumberHasNegativeFormat = true // } - match := groupLenRegex.FindString(formats[0]) + match := groupLenPercentRegex.FindString(trans.PercentNumberFormat) if len(match) > 0 { - trans.FmtPercentGroupLen = len(match) - 2 + trans.FmtPercentGroupLen = len(match) - 1 } - match = requiredDecimalRegex.FindString(formats[0]) + match = requiredDecimalRegex.FindString(trans.PercentNumberFormat) if len(match) > 0 { trans.FmtPercentMinDecimalLen = len(match) - 1 } - match = secondaryGroupLenRegex.FindString(formats[0]) + match = secondaryGroupLenRegex.FindString(trans.PercentNumberFormat) if len(match) > 0 { trans.FmtPercentSecondaryGroupLen = len(match) - 2 } - if formats[0][0] == '%' { - trans.FmtPercentLeft = true - } + // FmtPercentPrefix string + // FmtPercentSuffix string + // FmtPercentInPrefix bool + // FmtPercentLeft bool + + // if formats[0][0] == '%' { + // trans.FmtPercentLeft = true + // } + // trans.FmtPercentLeft - // start := 0 - // // prefix := "" + idx := 0 - // // positive prefix - // for start = 0; start < len(formats[0]); start++ { - // if formats[0][start] == '#' || formats[0][start] == '0' { - // break - // } + for idx = 0; idx < len(trans.PercentNumberFormat); idx++ { + if trans.PercentNumberFormat[idx] == '#' || trans.PercentNumberFormat[idx] == '0' { + trans.FmtPercentPrefix = trans.PercentNumberFormat[:idx] + break + } + } + + for idx = len(trans.PercentNumberFormat) - 1; idx >= 0; idx-- { + if trans.PercentNumberFormat[idx] == '#' || trans.PercentNumberFormat[idx] == '0' { + idx++ + trans.FmtPercentSuffix = trans.PercentNumberFormat[idx:] + break + } + } + + for idx = 0; idx < len(trans.FmtPercentPrefix); idx++ { + if trans.FmtPercentPrefix[idx] == '%' { + trans.FmtPercentInPrefix = true + + if idx == 0 { + trans.FmtPercentLeft = true + trans.FmtPercentPrefix = trans.FmtPercentPrefix[idx+1:] + } else { + trans.FmtPercentLeft = false + trans.FmtPercentPrefix = trans.FmtPercentPrefix[:idx] + } + + break + } + } + + for idx = 0; idx < len(trans.FmtPercentSuffix); idx++ { + if trans.FmtPercentSuffix[idx] == '%' { + trans.FmtPercentInPrefix = false + + if idx == 0 { + trans.FmtPercentLeft = true + trans.FmtPercentSuffix = trans.FmtPercentSuffix[idx+1:] + } else { + trans.FmtPercentLeft = false + trans.FmtPercentSuffix = trans.FmtPercentSuffix[:idx] + } + + break + } + } + + // if len(trans.FmtPercentPrefix) == 1 && trans.FmtPercentPrefix[0] == '%' { + // trans.FmtPercentPrefix = "" + // trans.FmtPercentInPrefix = true + // } + + // if len(trans.FmtPercentSuffix) == 1 && trans.FmtPercentSuffix[0] == '%' { + // trans.FmtPercentSuffix = "" + // trans.FmtPercentSuffix = false // } // // if start > 0 { diff --git a/cmd/translator.tmpl b/cmd/translator.tmpl index 623adb5d..c7c39909 100644 --- a/cmd/translator.tmpl +++ b/cmd/translator.tmpl @@ -263,9 +263,29 @@ func({{ .BaseLocale }} *{{ .Locale }}) FmtPercent(num float64, v uint64) []byte {{ end -}} } - {{ if eq .FmtPercentLeft true }} + {{ if and .FmtPercentInPrefix (not .FmtPercentLeft) }} {{- if eq .PercentLen 1 }} - b = append(b, {{ .BaseLocale }}.Percent[0]) + b = append(b, {{ .BaseLocale }}.percent[0]) + {{ else }} + for j := len({{ .BaseLocale }}.percent) - 1; j >= 0; j-- { + b = append(b, {{ .BaseLocale }}.percent[j]) + } + {{ end }} + {{ end }} + + {{ if gt (len .FmtPercentPrefix) 0}} + {{- if eq (len .FmtPercentPrefix) 1 }} + b = append(b, "{{ .FmtPercentPrefix }}"[0]) + {{ else }} + for j := {{ len .FmtPercentPrefix }} - 1; j >= 0; j-- { + b = append(b, "{{ .FmtPercentPrefix }}"[j]) + } + {{ end }} + {{ end }} + + {{ if and .FmtPercentInPrefix .FmtPercentLeft }} + {{- if eq .PercentLen 1 }} + b = append(b, {{ .BaseLocale }}.percent[0]) {{ else }} for j := len({{ .BaseLocale }}.percent) - 1; j >= 0; j-- { b = append(b, {{ .BaseLocale }}.percent[j]) @@ -278,6 +298,18 @@ func({{ .BaseLocale }} *{{ .Locale }}) FmtPercent(num float64, v uint64) []byte b[i], b[j] = b[j], b[i] } + {{ if and (not .FmtPercentInPrefix) .FmtPercentLeft }} + b = append(b, {{ .BaseLocale }}.percent...) + {{ end }} + + {{ if gt (len .FmtPercentSuffix) 0}} + b = append(b, "{{ .FmtPercentSuffix }}"...) + {{ end }} + + {{ if and (not .FmtPercentInPrefix) (not .FmtPercentLeft) }} + b = append(b, {{ .BaseLocale }}.percent...) + {{ end }} + {{ if gt .FmtPercentMinDecimalLen 0 }} if int(v) < {{ .FmtPercentMinDecimalLen }} { @@ -291,16 +323,6 @@ func({{ .BaseLocale }} *{{ .Locale }}) FmtPercent(num float64, v uint64) []byte } {{ end }} - {{ if eq .FmtPercentLeft false }} - {{- if eq .PercentLen 1 }} - b = append(b, {{ .BaseLocale }}.Percent[0]) - {{ else }} - for j := len({{ .BaseLocale }}.percent) - 1; j >= 0; j-- { - b = append(b, {{ .BaseLocale }}.percent[j]) - } - {{ end }} - {{ end }} - return b {{ else }} return []byte(s) @@ -196,9 +196,9 @@ func (cs *cs) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(cs.percent) - 1; j >= 0; j-- { - b = append(b, cs.percent[j]) - } + b = append(b, " "...) + + b = append(b, cs.percent...) return b } diff --git a/cs_CZ/cs_CZ.go b/cs_CZ/cs_CZ.go index 95cee901..a78814b2 100644 --- a/cs_CZ/cs_CZ.go +++ b/cs_CZ/cs_CZ.go @@ -196,9 +196,9 @@ func (cs *cs_CZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(cs.percent) - 1; j >= 0; j-- { - b = append(b, cs.percent[j]) - } + b = append(b, " "...) + + b = append(b, cs.percent...) return b } @@ -141,7 +141,9 @@ func (cu *cu) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, cu.Percent[0]) + b = append(b, " "...) + + b = append(b, cu.percent...) return b } diff --git a/cu_RU/cu_RU.go b/cu_RU/cu_RU.go index d2f87574..26a77af6 100644 --- a/cu_RU/cu_RU.go +++ b/cu_RU/cu_RU.go @@ -141,7 +141,9 @@ func (cu *cu_RU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, cu.Percent[0]) + b = append(b, " "...) + + b = append(b, cu.percent...) return b } @@ -226,9 +226,7 @@ func (cy *cy) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(cy.percent) - 1; j >= 0; j-- { - b = append(b, cy.percent[j]) - } + b = append(b, cy.percent...) return b } diff --git a/cy_GB/cy_GB.go b/cy_GB/cy_GB.go index af51cfc0..867bb22c 100644 --- a/cy_GB/cy_GB.go +++ b/cy_GB/cy_GB.go @@ -226,9 +226,7 @@ func (cy *cy_GB) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(cy.percent) - 1; j >= 0; j-- { - b = append(b, cy.percent[j]) - } + b = append(b, cy.percent...) return b } @@ -160,7 +160,9 @@ func (da *da) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, da.Percent[0]) + b = append(b, " "...) + + b = append(b, da.percent...) return b } diff --git a/da_DK/da_DK.go b/da_DK/da_DK.go index 800d79e1..760e97c3 100644 --- a/da_DK/da_DK.go +++ b/da_DK/da_DK.go @@ -160,7 +160,9 @@ func (da *da_DK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, da.Percent[0]) + b = append(b, " "...) + + b = append(b, da.percent...) return b } diff --git a/da_GL/da_GL.go b/da_GL/da_GL.go index bf35bbb4..f4b47d8d 100644 --- a/da_GL/da_GL.go +++ b/da_GL/da_GL.go @@ -160,7 +160,9 @@ func (da *da_GL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, da.Percent[0]) + b = append(b, " "...) + + b = append(b, da.percent...) return b } @@ -157,7 +157,9 @@ func (de *de) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, " "...) + + b = append(b, de.percent...) return b } diff --git a/de_AT/de_AT.go b/de_AT/de_AT.go index 0153cf12..bcbb218d 100644 --- a/de_AT/de_AT.go +++ b/de_AT/de_AT.go @@ -160,7 +160,9 @@ func (de *de_AT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, " "...) + + b = append(b, de.percent...) return b } diff --git a/de_BE/de_BE.go b/de_BE/de_BE.go index baa2ac97..1aab2f3d 100644 --- a/de_BE/de_BE.go +++ b/de_BE/de_BE.go @@ -157,7 +157,9 @@ func (de *de_BE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, " "...) + + b = append(b, de.percent...) return b } diff --git a/de_CH/de_CH.go b/de_CH/de_CH.go index 73483bfe..78e616ab 100644 --- a/de_CH/de_CH.go +++ b/de_CH/de_CH.go @@ -157,7 +157,7 @@ func (de *de_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, de.percent...) return b } diff --git a/de_DE/de_DE.go b/de_DE/de_DE.go index 2455a1f5..6a0e2bdc 100644 --- a/de_DE/de_DE.go +++ b/de_DE/de_DE.go @@ -157,7 +157,9 @@ func (de *de_DE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, " "...) + + b = append(b, de.percent...) return b } diff --git a/de_LI/de_LI.go b/de_LI/de_LI.go index 5768fd5d..8634a00f 100644 --- a/de_LI/de_LI.go +++ b/de_LI/de_LI.go @@ -157,7 +157,7 @@ func (de *de_LI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, de.percent...) return b } diff --git a/de_LU/de_LU.go b/de_LU/de_LU.go index 7c213350..3f3fddae 100644 --- a/de_LU/de_LU.go +++ b/de_LU/de_LU.go @@ -157,7 +157,9 @@ func (de *de_LU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, de.Percent[0]) + b = append(b, " "...) + + b = append(b, de.percent...) return b } @@ -145,9 +145,7 @@ func (dje *dje) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(dje.percent) - 1; j >= 0; j-- { - b = append(b, dje.percent[j]) - } + b = append(b, dje.percent...) return b } diff --git a/dje_NE/dje_NE.go b/dje_NE/dje_NE.go index aec0e849..04188af7 100644 --- a/dje_NE/dje_NE.go +++ b/dje_NE/dje_NE.go @@ -145,9 +145,7 @@ func (dje *dje_NE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(dje.percent) - 1; j >= 0; j-- { - b = append(b, dje.percent[j]) - } + b = append(b, dje.percent...) return b } @@ -153,7 +153,9 @@ func (dsb *dsb) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, dsb.Percent[0]) + b = append(b, " "...) + + b = append(b, dsb.percent...) return b } diff --git a/dsb_DE/dsb_DE.go b/dsb_DE/dsb_DE.go index 2e43bdae..23a1d0af 100644 --- a/dsb_DE/dsb_DE.go +++ b/dsb_DE/dsb_DE.go @@ -153,7 +153,9 @@ func (dsb *dsb_DE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, dsb.Percent[0]) + b = append(b, " "...) + + b = append(b, dsb.percent...) return b } @@ -145,9 +145,9 @@ func (dua *dua) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(dua.percent) - 1; j >= 0; j-- { - b = append(b, dua.percent[j]) - } + b = append(b, " "...) + + b = append(b, dua.percent...) return b } diff --git a/dua_CM/dua_CM.go b/dua_CM/dua_CM.go index 87d16e3c..075f79c2 100644 --- a/dua_CM/dua_CM.go +++ b/dua_CM/dua_CM.go @@ -145,9 +145,9 @@ func (dua *dua_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(dua.percent) - 1; j >= 0; j-- { - b = append(b, dua.percent[j]) - } + b = append(b, " "...) + + b = append(b, dua.percent...) return b } @@ -145,9 +145,7 @@ func (dyo *dyo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(dyo.percent) - 1; j >= 0; j-- { - b = append(b, dyo.percent[j]) - } + b = append(b, dyo.percent...) return b } diff --git a/dyo_SN/dyo_SN.go b/dyo_SN/dyo_SN.go index c8ab2df3..0eb879a4 100644 --- a/dyo_SN/dyo_SN.go +++ b/dyo_SN/dyo_SN.go @@ -145,9 +145,7 @@ func (dyo *dyo_SN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(dyo.percent) - 1; j >= 0; j-- { - b = append(b, dyo.percent[j]) - } + b = append(b, dyo.percent...) return b } @@ -147,7 +147,9 @@ func (dz *dz) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, dz.Percent[0]) + b = append(b, " "...) + + b = append(b, dz.percent...) return b } diff --git a/dz_BT/dz_BT.go b/dz_BT/dz_BT.go index 4923cd9e..f9bd99e1 100644 --- a/dz_BT/dz_BT.go +++ b/dz_BT/dz_BT.go @@ -147,7 +147,9 @@ func (dz *dz_BT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, dz.Percent[0]) + b = append(b, " "...) + + b = append(b, dz.percent...) return b } @@ -156,7 +156,7 @@ func (el *el) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, el.Percent[0]) + b = append(b, el.percent...) return b } diff --git a/el_CY/el_CY.go b/el_CY/el_CY.go index 2fc054c7..33b6369a 100644 --- a/el_CY/el_CY.go +++ b/el_CY/el_CY.go @@ -156,7 +156,7 @@ func (el *el_CY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, el.Percent[0]) + b = append(b, el.percent...) return b } diff --git a/el_GR/el_GR.go b/el_GR/el_GR.go index 1e618d1f..277e3699 100644 --- a/el_GR/el_GR.go +++ b/el_GR/el_GR.go @@ -156,7 +156,7 @@ func (el *el_GR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, el.Percent[0]) + b = append(b, el.percent...) return b } @@ -159,7 +159,7 @@ func (en *en) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_001/en_001.go b/en_001/en_001.go index b989d434..18fcc2ca 100644 --- a/en_001/en_001.go +++ b/en_001/en_001.go @@ -159,7 +159,7 @@ func (en *en_001) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_150/en_150.go b/en_150/en_150.go index 080b7fd7..de42f45c 100644 --- a/en_150/en_150.go +++ b/en_150/en_150.go @@ -66,8 +66,8 @@ func (en *en_150) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_150) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_150) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_AG/en_AG.go b/en_AG/en_AG.go index 37e7b13a..8ac8d217 100644 --- a/en_AG/en_AG.go +++ b/en_AG/en_AG.go @@ -159,7 +159,7 @@ func (en *en_AG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_AI/en_AI.go b/en_AI/en_AI.go index 2e260115..6ee42426 100644 --- a/en_AI/en_AI.go +++ b/en_AI/en_AI.go @@ -159,7 +159,7 @@ func (en *en_AI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_AS/en_AS.go b/en_AS/en_AS.go index f675fc11..d41fbf9b 100644 --- a/en_AS/en_AS.go +++ b/en_AS/en_AS.go @@ -159,7 +159,7 @@ func (en *en_AS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_AT/en_AT.go b/en_AT/en_AT.go index a70f803b..8af0ca0f 100644 --- a/en_AT/en_AT.go +++ b/en_AT/en_AT.go @@ -66,8 +66,8 @@ func (en *en_AT) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_AT) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,9 @@ func (en *en_AT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, " "...) + + b = append(b, en.percent...) return b } diff --git a/en_AU/en_AU.go b/en_AU/en_AU.go index b9531aa6..2698a62c 100644 --- a/en_AU/en_AU.go +++ b/en_AU/en_AU.go @@ -159,7 +159,7 @@ func (en *en_AU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BB/en_BB.go b/en_BB/en_BB.go index 97944389..37945c49 100644 --- a/en_BB/en_BB.go +++ b/en_BB/en_BB.go @@ -159,7 +159,7 @@ func (en *en_BB) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BE/en_BE.go b/en_BE/en_BE.go index 3e4d979e..8d1bbcf3 100644 --- a/en_BE/en_BE.go +++ b/en_BE/en_BE.go @@ -159,7 +159,7 @@ func (en *en_BE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BI/en_BI.go b/en_BI/en_BI.go index 1d4a8e36..d949a004 100644 --- a/en_BI/en_BI.go +++ b/en_BI/en_BI.go @@ -159,7 +159,7 @@ func (en *en_BI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BM/en_BM.go b/en_BM/en_BM.go index dedc32a8..cfb8d004 100644 --- a/en_BM/en_BM.go +++ b/en_BM/en_BM.go @@ -66,8 +66,8 @@ func (en *en_BM) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_BM) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_BM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BS/en_BS.go b/en_BS/en_BS.go index 5c207c51..57fce8da 100644 --- a/en_BS/en_BS.go +++ b/en_BS/en_BS.go @@ -159,7 +159,7 @@ func (en *en_BS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BW/en_BW.go b/en_BW/en_BW.go index 11ac2c9d..25fabe6c 100644 --- a/en_BW/en_BW.go +++ b/en_BW/en_BW.go @@ -159,7 +159,7 @@ func (en *en_BW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_BZ/en_BZ.go b/en_BZ/en_BZ.go index c6ee1efc..bef20821 100644 --- a/en_BZ/en_BZ.go +++ b/en_BZ/en_BZ.go @@ -159,7 +159,7 @@ func (en *en_BZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CA/en_CA.go b/en_CA/en_CA.go index 40d669d5..89a212d0 100644 --- a/en_CA/en_CA.go +++ b/en_CA/en_CA.go @@ -159,7 +159,7 @@ func (en *en_CA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CC/en_CC.go b/en_CC/en_CC.go index 9cfb49ca..a90cd0a7 100644 --- a/en_CC/en_CC.go +++ b/en_CC/en_CC.go @@ -159,7 +159,7 @@ func (en *en_CC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CH/en_CH.go b/en_CH/en_CH.go index 7c5b889e..d4de801a 100644 --- a/en_CH/en_CH.go +++ b/en_CH/en_CH.go @@ -159,7 +159,7 @@ func (en *en_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CK/en_CK.go b/en_CK/en_CK.go index 7cbbfd70..6cd8e860 100644 --- a/en_CK/en_CK.go +++ b/en_CK/en_CK.go @@ -66,8 +66,8 @@ func (en *en_CK) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_CK) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_CK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CM/en_CM.go b/en_CM/en_CM.go index 9da44775..4b3ef9ca 100644 --- a/en_CM/en_CM.go +++ b/en_CM/en_CM.go @@ -159,7 +159,7 @@ func (en *en_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CX/en_CX.go b/en_CX/en_CX.go index 2f38b65b..957b4202 100644 --- a/en_CX/en_CX.go +++ b/en_CX/en_CX.go @@ -159,7 +159,7 @@ func (en *en_CX) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_CY/en_CY.go b/en_CY/en_CY.go index 3dc5510f..e48cbd1e 100644 --- a/en_CY/en_CY.go +++ b/en_CY/en_CY.go @@ -159,7 +159,7 @@ func (en *en_CY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_DE/en_DE.go b/en_DE/en_DE.go index 578a44dc..3813f5b3 100644 --- a/en_DE/en_DE.go +++ b/en_DE/en_DE.go @@ -159,7 +159,9 @@ func (en *en_DE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, " "...) + + b = append(b, en.percent...) return b } diff --git a/en_DG/en_DG.go b/en_DG/en_DG.go index ad890469..7860115d 100644 --- a/en_DG/en_DG.go +++ b/en_DG/en_DG.go @@ -159,7 +159,7 @@ func (en *en_DG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_DK/en_DK.go b/en_DK/en_DK.go index 49821a5d..bfa7afe2 100644 --- a/en_DK/en_DK.go +++ b/en_DK/en_DK.go @@ -159,7 +159,9 @@ func (en *en_DK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, " "...) + + b = append(b, en.percent...) return b } diff --git a/en_DM/en_DM.go b/en_DM/en_DM.go index 910a7e9d..aa56f4c2 100644 --- a/en_DM/en_DM.go +++ b/en_DM/en_DM.go @@ -159,7 +159,7 @@ func (en *en_DM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_ER/en_ER.go b/en_ER/en_ER.go index 03c356e8..7919053c 100644 --- a/en_ER/en_ER.go +++ b/en_ER/en_ER.go @@ -159,7 +159,7 @@ func (en *en_ER) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_FI/en_FI.go b/en_FI/en_FI.go index 917f5072..e2bde1ac 100644 --- a/en_FI/en_FI.go +++ b/en_FI/en_FI.go @@ -162,7 +162,9 @@ func (en *en_FI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, " "...) + + b = append(b, en.percent...) return b } diff --git a/en_FJ/en_FJ.go b/en_FJ/en_FJ.go index f2cf6a22..48c9d656 100644 --- a/en_FJ/en_FJ.go +++ b/en_FJ/en_FJ.go @@ -159,7 +159,7 @@ func (en *en_FJ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_FK/en_FK.go b/en_FK/en_FK.go index eb3ebdde..db2c45d0 100644 --- a/en_FK/en_FK.go +++ b/en_FK/en_FK.go @@ -159,7 +159,7 @@ func (en *en_FK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_FM/en_FM.go b/en_FM/en_FM.go index 45b1573b..b0af9154 100644 --- a/en_FM/en_FM.go +++ b/en_FM/en_FM.go @@ -159,7 +159,7 @@ func (en *en_FM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GB/en_GB.go b/en_GB/en_GB.go index 5feb8b61..b237e7a2 100644 --- a/en_GB/en_GB.go +++ b/en_GB/en_GB.go @@ -159,7 +159,7 @@ func (en *en_GB) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GD/en_GD.go b/en_GD/en_GD.go index a6860ad1..cc9da89b 100644 --- a/en_GD/en_GD.go +++ b/en_GD/en_GD.go @@ -159,7 +159,7 @@ func (en *en_GD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GG/en_GG.go b/en_GG/en_GG.go index 46c8c111..e015a5fa 100644 --- a/en_GG/en_GG.go +++ b/en_GG/en_GG.go @@ -159,7 +159,7 @@ func (en *en_GG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GH/en_GH.go b/en_GH/en_GH.go index 96e68e5d..5d5f1e0f 100644 --- a/en_GH/en_GH.go +++ b/en_GH/en_GH.go @@ -66,8 +66,8 @@ func (en *en_GH) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_GH) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_GH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GI/en_GI.go b/en_GI/en_GI.go index ff26d457..2ab60757 100644 --- a/en_GI/en_GI.go +++ b/en_GI/en_GI.go @@ -66,8 +66,8 @@ func (en *en_GI) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_GI) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_GI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GM/en_GM.go b/en_GM/en_GM.go index 7a66115c..b832c40b 100644 --- a/en_GM/en_GM.go +++ b/en_GM/en_GM.go @@ -159,7 +159,7 @@ func (en *en_GM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GU/en_GU.go b/en_GU/en_GU.go index 69528cf8..8e0ddcd3 100644 --- a/en_GU/en_GU.go +++ b/en_GU/en_GU.go @@ -159,7 +159,7 @@ func (en *en_GU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_GY/en_GY.go b/en_GY/en_GY.go index ed93a970..e69bc932 100644 --- a/en_GY/en_GY.go +++ b/en_GY/en_GY.go @@ -159,7 +159,7 @@ func (en *en_GY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_HK/en_HK.go b/en_HK/en_HK.go index 759c4817..8fe8c9ca 100644 --- a/en_HK/en_HK.go +++ b/en_HK/en_HK.go @@ -159,7 +159,7 @@ func (en *en_HK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_IE/en_IE.go b/en_IE/en_IE.go index 98a58f64..d75a3761 100644 --- a/en_IE/en_IE.go +++ b/en_IE/en_IE.go @@ -159,7 +159,7 @@ func (en *en_IE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_IL/en_IL.go b/en_IL/en_IL.go index 93bb4a39..8e807d4c 100644 --- a/en_IL/en_IL.go +++ b/en_IL/en_IL.go @@ -159,7 +159,7 @@ func (en *en_IL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_IM/en_IM.go b/en_IM/en_IM.go index c18ac043..a5885980 100644 --- a/en_IM/en_IM.go +++ b/en_IM/en_IM.go @@ -159,7 +159,7 @@ func (en *en_IM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_IN/en_IN.go b/en_IN/en_IN.go index 762ea989..ed650a70 100644 --- a/en_IN/en_IN.go +++ b/en_IN/en_IN.go @@ -168,7 +168,7 @@ func (en *en_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_IO/en_IO.go b/en_IO/en_IO.go index 2375b64f..70dabef6 100644 --- a/en_IO/en_IO.go +++ b/en_IO/en_IO.go @@ -159,7 +159,7 @@ func (en *en_IO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_JE/en_JE.go b/en_JE/en_JE.go index 772eb2d9..4740a3b0 100644 --- a/en_JE/en_JE.go +++ b/en_JE/en_JE.go @@ -66,8 +66,8 @@ func (en *en_JE) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_JE) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_JE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_JM/en_JM.go b/en_JM/en_JM.go index a218a0db..495ab26e 100644 --- a/en_JM/en_JM.go +++ b/en_JM/en_JM.go @@ -159,7 +159,7 @@ func (en *en_JM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_KE/en_KE.go b/en_KE/en_KE.go index 50fa3497..266368bf 100644 --- a/en_KE/en_KE.go +++ b/en_KE/en_KE.go @@ -159,7 +159,7 @@ func (en *en_KE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_KI/en_KI.go b/en_KI/en_KI.go index bbe56cc6..396ce9f7 100644 --- a/en_KI/en_KI.go +++ b/en_KI/en_KI.go @@ -159,7 +159,7 @@ func (en *en_KI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_KN/en_KN.go b/en_KN/en_KN.go index 585adfd3..c1386fed 100644 --- a/en_KN/en_KN.go +++ b/en_KN/en_KN.go @@ -159,7 +159,7 @@ func (en *en_KN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_KY/en_KY.go b/en_KY/en_KY.go index 9a29cf34..a377d2b3 100644 --- a/en_KY/en_KY.go +++ b/en_KY/en_KY.go @@ -159,7 +159,7 @@ func (en *en_KY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_LC/en_LC.go b/en_LC/en_LC.go index ab636c8e..b5aed9f7 100644 --- a/en_LC/en_LC.go +++ b/en_LC/en_LC.go @@ -159,7 +159,7 @@ func (en *en_LC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_LR/en_LR.go b/en_LR/en_LR.go index 8bd0cb13..4345c667 100644 --- a/en_LR/en_LR.go +++ b/en_LR/en_LR.go @@ -159,7 +159,7 @@ func (en *en_LR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_LS/en_LS.go b/en_LS/en_LS.go index 4fafd77b..149ff60d 100644 --- a/en_LS/en_LS.go +++ b/en_LS/en_LS.go @@ -159,7 +159,7 @@ func (en *en_LS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MG/en_MG.go b/en_MG/en_MG.go index e895390c..f6f14048 100644 --- a/en_MG/en_MG.go +++ b/en_MG/en_MG.go @@ -66,8 +66,8 @@ func (en *en_MG) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_MG) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_MG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MH/en_MH.go b/en_MH/en_MH.go index 2c5f1a5e..89e51306 100644 --- a/en_MH/en_MH.go +++ b/en_MH/en_MH.go @@ -66,8 +66,8 @@ func (en *en_MH) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_MH) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_MH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MO/en_MO.go b/en_MO/en_MO.go index 1263e40a..76fa689a 100644 --- a/en_MO/en_MO.go +++ b/en_MO/en_MO.go @@ -159,7 +159,7 @@ func (en *en_MO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MP/en_MP.go b/en_MP/en_MP.go index 6378cfc2..4750a9b5 100644 --- a/en_MP/en_MP.go +++ b/en_MP/en_MP.go @@ -159,7 +159,7 @@ func (en *en_MP) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MS/en_MS.go b/en_MS/en_MS.go index 584a7f0b..a6d84f2c 100644 --- a/en_MS/en_MS.go +++ b/en_MS/en_MS.go @@ -159,7 +159,7 @@ func (en *en_MS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MT/en_MT.go b/en_MT/en_MT.go index 9138f965..521e2f05 100644 --- a/en_MT/en_MT.go +++ b/en_MT/en_MT.go @@ -66,8 +66,8 @@ func (en *en_MT) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_MT) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_MT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MU/en_MU.go b/en_MU/en_MU.go index 3a206f0e..3b823e7b 100644 --- a/en_MU/en_MU.go +++ b/en_MU/en_MU.go @@ -159,7 +159,7 @@ func (en *en_MU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MW/en_MW.go b/en_MW/en_MW.go index 20378e0a..d3a487b0 100644 --- a/en_MW/en_MW.go +++ b/en_MW/en_MW.go @@ -159,7 +159,7 @@ func (en *en_MW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_MY/en_MY.go b/en_MY/en_MY.go index e99ea17a..30ac3ca3 100644 --- a/en_MY/en_MY.go +++ b/en_MY/en_MY.go @@ -159,7 +159,7 @@ func (en *en_MY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NA/en_NA.go b/en_NA/en_NA.go index 37c4cde0..58190a0c 100644 --- a/en_NA/en_NA.go +++ b/en_NA/en_NA.go @@ -159,7 +159,7 @@ func (en *en_NA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NF/en_NF.go b/en_NF/en_NF.go index a22b6287..a91a28fe 100644 --- a/en_NF/en_NF.go +++ b/en_NF/en_NF.go @@ -159,7 +159,7 @@ func (en *en_NF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NG/en_NG.go b/en_NG/en_NG.go index b75f53a8..c4436f20 100644 --- a/en_NG/en_NG.go +++ b/en_NG/en_NG.go @@ -66,8 +66,8 @@ func (en *en_NG) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_NG) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_NG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NL/en_NL.go b/en_NL/en_NL.go index c56a101b..6f8be1f9 100644 --- a/en_NL/en_NL.go +++ b/en_NL/en_NL.go @@ -159,7 +159,7 @@ func (en *en_NL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NR/en_NR.go b/en_NR/en_NR.go index 700f7b68..3f0a7ac9 100644 --- a/en_NR/en_NR.go +++ b/en_NR/en_NR.go @@ -159,7 +159,7 @@ func (en *en_NR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NU/en_NU.go b/en_NU/en_NU.go index 71cc7db9..15957556 100644 --- a/en_NU/en_NU.go +++ b/en_NU/en_NU.go @@ -159,7 +159,7 @@ func (en *en_NU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_NZ/en_NZ.go b/en_NZ/en_NZ.go index e257a12a..9ff5e769 100644 --- a/en_NZ/en_NZ.go +++ b/en_NZ/en_NZ.go @@ -159,7 +159,7 @@ func (en *en_NZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_PG/en_PG.go b/en_PG/en_PG.go index 0a34f3b4..6326d3c0 100644 --- a/en_PG/en_PG.go +++ b/en_PG/en_PG.go @@ -159,7 +159,7 @@ func (en *en_PG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_PH/en_PH.go b/en_PH/en_PH.go index e53c43e7..c73783ba 100644 --- a/en_PH/en_PH.go +++ b/en_PH/en_PH.go @@ -159,7 +159,7 @@ func (en *en_PH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_PK/en_PK.go b/en_PK/en_PK.go index 05437377..8324cb8a 100644 --- a/en_PK/en_PK.go +++ b/en_PK/en_PK.go @@ -66,8 +66,8 @@ func (en *en_PK) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_PK) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_PK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_PN/en_PN.go b/en_PN/en_PN.go index e1c26fd8..9b92027c 100644 --- a/en_PN/en_PN.go +++ b/en_PN/en_PN.go @@ -159,7 +159,7 @@ func (en *en_PN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_PR/en_PR.go b/en_PR/en_PR.go index 3b3947df..401995ac 100644 --- a/en_PR/en_PR.go +++ b/en_PR/en_PR.go @@ -159,7 +159,7 @@ func (en *en_PR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_PW/en_PW.go b/en_PW/en_PW.go index e1f3b312..2b4ffaa6 100644 --- a/en_PW/en_PW.go +++ b/en_PW/en_PW.go @@ -159,7 +159,7 @@ func (en *en_PW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_RW/en_RW.go b/en_RW/en_RW.go index 4d8cba74..5813d3da 100644 --- a/en_RW/en_RW.go +++ b/en_RW/en_RW.go @@ -159,7 +159,7 @@ func (en *en_RW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SB/en_SB.go b/en_SB/en_SB.go index 09df165a..c5e1dca2 100644 --- a/en_SB/en_SB.go +++ b/en_SB/en_SB.go @@ -159,7 +159,7 @@ func (en *en_SB) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SC/en_SC.go b/en_SC/en_SC.go index 67fc4095..b0284cf8 100644 --- a/en_SC/en_SC.go +++ b/en_SC/en_SC.go @@ -159,7 +159,7 @@ func (en *en_SC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SD/en_SD.go b/en_SD/en_SD.go index e26c33b9..ec2e0ead 100644 --- a/en_SD/en_SD.go +++ b/en_SD/en_SD.go @@ -159,7 +159,7 @@ func (en *en_SD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SE/en_SE.go b/en_SE/en_SE.go index 7cd03355..de05decc 100644 --- a/en_SE/en_SE.go +++ b/en_SE/en_SE.go @@ -162,7 +162,9 @@ func (en *en_SE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, " "...) + + b = append(b, en.percent...) return b } diff --git a/en_SG/en_SG.go b/en_SG/en_SG.go index ae803351..07a2ecde 100644 --- a/en_SG/en_SG.go +++ b/en_SG/en_SG.go @@ -159,7 +159,7 @@ func (en *en_SG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SH/en_SH.go b/en_SH/en_SH.go index ce0a3e8b..4af8df0c 100644 --- a/en_SH/en_SH.go +++ b/en_SH/en_SH.go @@ -159,7 +159,7 @@ func (en *en_SH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SI/en_SI.go b/en_SI/en_SI.go index 86ff34c7..8bd4bfb2 100644 --- a/en_SI/en_SI.go +++ b/en_SI/en_SI.go @@ -159,7 +159,7 @@ func (en *en_SI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SL/en_SL.go b/en_SL/en_SL.go index 844416a7..5394f6df 100644 --- a/en_SL/en_SL.go +++ b/en_SL/en_SL.go @@ -159,7 +159,7 @@ func (en *en_SL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SS/en_SS.go b/en_SS/en_SS.go index 0ef2035c..c36b7651 100644 --- a/en_SS/en_SS.go +++ b/en_SS/en_SS.go @@ -66,8 +66,8 @@ func (en *en_SS) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_SS) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_SS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SX/en_SX.go b/en_SX/en_SX.go index b2b1c368..57cc3726 100644 --- a/en_SX/en_SX.go +++ b/en_SX/en_SX.go @@ -66,8 +66,8 @@ func (en *en_SX) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_SX) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_SX) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_SZ/en_SZ.go b/en_SZ/en_SZ.go index c6516224..341f409b 100644 --- a/en_SZ/en_SZ.go +++ b/en_SZ/en_SZ.go @@ -159,7 +159,7 @@ func (en *en_SZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_TC/en_TC.go b/en_TC/en_TC.go index bbd146d6..4df9cb7b 100644 --- a/en_TC/en_TC.go +++ b/en_TC/en_TC.go @@ -159,7 +159,7 @@ func (en *en_TC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_TK/en_TK.go b/en_TK/en_TK.go index d1f3f7ef..766f30fe 100644 --- a/en_TK/en_TK.go +++ b/en_TK/en_TK.go @@ -159,7 +159,7 @@ func (en *en_TK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_TO/en_TO.go b/en_TO/en_TO.go index 98c39a56..df358c30 100644 --- a/en_TO/en_TO.go +++ b/en_TO/en_TO.go @@ -159,7 +159,7 @@ func (en *en_TO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_TT/en_TT.go b/en_TT/en_TT.go index e56c50a3..537f8ef6 100644 --- a/en_TT/en_TT.go +++ b/en_TT/en_TT.go @@ -159,7 +159,7 @@ func (en *en_TT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_TV/en_TV.go b/en_TV/en_TV.go index a5ee56cf..31dc560f 100644 --- a/en_TV/en_TV.go +++ b/en_TV/en_TV.go @@ -66,8 +66,8 @@ func (en *en_TV) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_TV) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_TV) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_TZ/en_TZ.go b/en_TZ/en_TZ.go index ce2508ac..ef00d021 100644 --- a/en_TZ/en_TZ.go +++ b/en_TZ/en_TZ.go @@ -66,8 +66,8 @@ func (en *en_TZ) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_TZ) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_TZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_UG/en_UG.go b/en_UG/en_UG.go index 08eaf06a..5ad70334 100644 --- a/en_UG/en_UG.go +++ b/en_UG/en_UG.go @@ -159,7 +159,7 @@ func (en *en_UG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_UM/en_UM.go b/en_UM/en_UM.go index 5e798064..2ad74e13 100644 --- a/en_UM/en_UM.go +++ b/en_UM/en_UM.go @@ -66,8 +66,8 @@ func (en *en_UM) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_UM) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_UM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_US/en_US.go b/en_US/en_US.go index 1225c540..61eb7192 100644 --- a/en_US/en_US.go +++ b/en_US/en_US.go @@ -66,8 +66,8 @@ func (en *en_US) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_US) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_US) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_US_POSIX/en_US_POSIX.go b/en_US_POSIX/en_US_POSIX.go index 82baddc0..696a9bda 100644 --- a/en_US_POSIX/en_US_POSIX.go +++ b/en_US_POSIX/en_US_POSIX.go @@ -66,8 +66,8 @@ func (en *en_US_POSIX) CardinalPluralRule(num float64, v uint64) locales.PluralR func (en *en_US_POSIX) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -147,7 +147,7 @@ func (en *en_US_POSIX) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_VC/en_VC.go b/en_VC/en_VC.go index f9ef8fe6..bf384fa5 100644 --- a/en_VC/en_VC.go +++ b/en_VC/en_VC.go @@ -159,7 +159,7 @@ func (en *en_VC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_VG/en_VG.go b/en_VG/en_VG.go index f8e6b40d..75a1334c 100644 --- a/en_VG/en_VG.go +++ b/en_VG/en_VG.go @@ -159,7 +159,7 @@ func (en *en_VG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_VI/en_VI.go b/en_VI/en_VI.go index 38cd777d..30c0d436 100644 --- a/en_VI/en_VI.go +++ b/en_VI/en_VI.go @@ -159,7 +159,7 @@ func (en *en_VI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_VU/en_VU.go b/en_VU/en_VU.go index 12cd28e0..46d58b32 100644 --- a/en_VU/en_VU.go +++ b/en_VU/en_VU.go @@ -159,7 +159,7 @@ func (en *en_VU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_WS/en_WS.go b/en_WS/en_WS.go index 0c715e87..8d43d1ec 100644 --- a/en_WS/en_WS.go +++ b/en_WS/en_WS.go @@ -159,7 +159,7 @@ func (en *en_WS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_ZA/en_ZA.go b/en_ZA/en_ZA.go index 68fae488..a85d16ed 100644 --- a/en_ZA/en_ZA.go +++ b/en_ZA/en_ZA.go @@ -162,7 +162,7 @@ func (en *en_ZA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_ZM/en_ZM.go b/en_ZM/en_ZM.go index 0c4a0e05..c222b1f6 100644 --- a/en_ZM/en_ZM.go +++ b/en_ZM/en_ZM.go @@ -66,8 +66,8 @@ func (en *en_ZM) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (en *en_ZM) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -159,7 +159,7 @@ func (en *en_ZM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } diff --git a/en_ZW/en_ZW.go b/en_ZW/en_ZW.go index c318a881..722b77dd 100644 --- a/en_ZW/en_ZW.go +++ b/en_ZW/en_ZW.go @@ -159,7 +159,7 @@ func (en *en_ZW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, en.Percent[0]) + b = append(b, en.percent...) return b } @@ -152,7 +152,7 @@ func (eo *eo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, eo.Percent[0]) + b = append(b, eo.percent...) return b } diff --git a/eo_001/eo_001.go b/eo_001/eo_001.go index 3ae72616..8af8de12 100644 --- a/eo_001/eo_001.go +++ b/eo_001/eo_001.go @@ -152,7 +152,7 @@ func (eo *eo_001) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, eo.Percent[0]) + b = append(b, eo.percent...) return b } @@ -145,7 +145,9 @@ func (es *es) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_419/es_419.go b/es_419/es_419.go index 5c7f91d1..55be5724 100644 --- a/es_419/es_419.go +++ b/es_419/es_419.go @@ -145,7 +145,9 @@ func (es *es_419) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_AR/es_AR.go b/es_AR/es_AR.go index b334a750..0cc2d6ff 100644 --- a/es_AR/es_AR.go +++ b/es_AR/es_AR.go @@ -145,7 +145,9 @@ func (es *es_AR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_BO/es_BO.go b/es_BO/es_BO.go index 2d0c77b5..1d4f0a87 100644 --- a/es_BO/es_BO.go +++ b/es_BO/es_BO.go @@ -145,7 +145,9 @@ func (es *es_BO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_BR/es_BR.go b/es_BR/es_BR.go index fa8c9272..a23baa45 100644 --- a/es_BR/es_BR.go +++ b/es_BR/es_BR.go @@ -145,7 +145,9 @@ func (es *es_BR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_CL/es_CL.go b/es_CL/es_CL.go index 1272cd83..3e8bb8e7 100644 --- a/es_CL/es_CL.go +++ b/es_CL/es_CL.go @@ -145,7 +145,9 @@ func (es *es_CL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_CO/es_CO.go b/es_CO/es_CO.go index b79c7b97..1c879cd3 100644 --- a/es_CO/es_CO.go +++ b/es_CO/es_CO.go @@ -145,7 +145,7 @@ func (es *es_CO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, es.percent...) return b } diff --git a/es_CR/es_CR.go b/es_CR/es_CR.go index dc23782f..4207362a 100644 --- a/es_CR/es_CR.go +++ b/es_CR/es_CR.go @@ -148,7 +148,9 @@ func (es *es_CR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_CU/es_CU.go b/es_CU/es_CU.go index 10355084..e25697ed 100644 --- a/es_CU/es_CU.go +++ b/es_CU/es_CU.go @@ -145,7 +145,9 @@ func (es *es_CU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_DO/es_DO.go b/es_DO/es_DO.go index 1ef64f34..7d6a5d67 100644 --- a/es_DO/es_DO.go +++ b/es_DO/es_DO.go @@ -145,7 +145,7 @@ func (es *es_DO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, es.percent...) return b } diff --git a/es_EA/es_EA.go b/es_EA/es_EA.go index b809584e..8e5ca3e9 100644 --- a/es_EA/es_EA.go +++ b/es_EA/es_EA.go @@ -145,7 +145,9 @@ func (es *es_EA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_EC/es_EC.go b/es_EC/es_EC.go index 1250d0d5..93ec75ef 100644 --- a/es_EC/es_EC.go +++ b/es_EC/es_EC.go @@ -145,7 +145,9 @@ func (es *es_EC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_ES/es_ES.go b/es_ES/es_ES.go index 5861b2a8..12f8effc 100644 --- a/es_ES/es_ES.go +++ b/es_ES/es_ES.go @@ -145,7 +145,9 @@ func (es *es_ES) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_GQ/es_GQ.go b/es_GQ/es_GQ.go index eed6a0c2..d348e59c 100644 --- a/es_GQ/es_GQ.go +++ b/es_GQ/es_GQ.go @@ -145,7 +145,9 @@ func (es *es_GQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_GT/es_GT.go b/es_GT/es_GT.go index 0c883b0b..4fe81ba6 100644 --- a/es_GT/es_GT.go +++ b/es_GT/es_GT.go @@ -145,7 +145,9 @@ func (es *es_GT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_HN/es_HN.go b/es_HN/es_HN.go index ee83a3f3..ee27d0de 100644 --- a/es_HN/es_HN.go +++ b/es_HN/es_HN.go @@ -145,7 +145,9 @@ func (es *es_HN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_IC/es_IC.go b/es_IC/es_IC.go index 87d2a5c4..6bceb58e 100644 --- a/es_IC/es_IC.go +++ b/es_IC/es_IC.go @@ -145,7 +145,9 @@ func (es *es_IC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_MX/es_MX.go b/es_MX/es_MX.go index 80863471..4ac999be 100644 --- a/es_MX/es_MX.go +++ b/es_MX/es_MX.go @@ -145,7 +145,7 @@ func (es *es_MX) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, es.percent...) return b } diff --git a/es_NI/es_NI.go b/es_NI/es_NI.go index 9cb62070..287ba641 100644 --- a/es_NI/es_NI.go +++ b/es_NI/es_NI.go @@ -145,7 +145,9 @@ func (es *es_NI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_PA/es_PA.go b/es_PA/es_PA.go index 7d282b4d..4330a393 100644 --- a/es_PA/es_PA.go +++ b/es_PA/es_PA.go @@ -145,7 +145,9 @@ func (es *es_PA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_PE/es_PE.go b/es_PE/es_PE.go index 5a5468b2..43391ef0 100644 --- a/es_PE/es_PE.go +++ b/es_PE/es_PE.go @@ -145,7 +145,9 @@ func (es *es_PE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_PH/es_PH.go b/es_PH/es_PH.go index b71757f5..3e92443b 100644 --- a/es_PH/es_PH.go +++ b/es_PH/es_PH.go @@ -145,7 +145,9 @@ func (es *es_PH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_PR/es_PR.go b/es_PR/es_PR.go index 468869ca..13fab5cb 100644 --- a/es_PR/es_PR.go +++ b/es_PR/es_PR.go @@ -145,7 +145,9 @@ func (es *es_PR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_PY/es_PY.go b/es_PY/es_PY.go index e0e59e4e..deb13a51 100644 --- a/es_PY/es_PY.go +++ b/es_PY/es_PY.go @@ -145,7 +145,9 @@ func (es *es_PY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_SV/es_SV.go b/es_SV/es_SV.go index b37c328e..5f40e7cc 100644 --- a/es_SV/es_SV.go +++ b/es_SV/es_SV.go @@ -145,7 +145,9 @@ func (es *es_SV) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_US/es_US.go b/es_US/es_US.go index 1962045d..334d3378 100644 --- a/es_US/es_US.go +++ b/es_US/es_US.go @@ -145,7 +145,9 @@ func (es *es_US) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_UY/es_UY.go b/es_UY/es_UY.go index 2376695b..9f141890 100644 --- a/es_UY/es_UY.go +++ b/es_UY/es_UY.go @@ -145,7 +145,9 @@ func (es *es_UY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } diff --git a/es_VE/es_VE.go b/es_VE/es_VE.go index 128c01f2..15a20b2f 100644 --- a/es_VE/es_VE.go +++ b/es_VE/es_VE.go @@ -145,7 +145,9 @@ func (es *es_VE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, es.Percent[0]) + b = append(b, " "...) + + b = append(b, es.percent...) return b } @@ -153,7 +153,7 @@ func (et *et) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, et.Percent[0]) + b = append(b, et.percent...) return b } diff --git a/et_EE/et_EE.go b/et_EE/et_EE.go index eca73a6d..e75f51f0 100644 --- a/et_EE/et_EE.go +++ b/et_EE/et_EE.go @@ -153,7 +153,7 @@ func (et *et_EE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, et.Percent[0]) + b = append(b, et.percent...) return b } @@ -30,7 +30,7 @@ func New() locales.Translator { minus: []byte{0x2d}, percent: []byte{0x25}, perMille: []byte{0xe2, 0x80, 0xb0}, - currencies: [][]uint8{[]uint8{0x41, 0x44, 0x50}, []uint8{0x41, 0x45, 0x44}, []uint8{0x41, 0x46, 0x41}, []uint8{0x41, 0x46, 0x4e}, []uint8{0x41, 0x4c, 0x4b}, []uint8{0x41, 0x4c, 0x4c}, []uint8{0x41, 0x4d, 0x44}, []uint8{0x41, 0x4e, 0x47}, []uint8{0x41, 0x4f, 0x41}, []uint8{0x41, 0x4f, 0x4b}, []uint8{0x41, 0x4f, 0x4e}, []uint8{0x41, 0x4f, 0x52}, []uint8{0x41, 0x52, 0x41}, []uint8{0x41, 0x52, 0x4c}, []uint8{0x41, 0x52, 0x4d}, []uint8{0x41, 0x52, 0x50}, []uint8{0x41, 0x52, 0x53}, []uint8{0x41, 0x54, 0x53}, []uint8{0x41, 0x24}, []uint8{0x41, 0x57, 0x47}, []uint8{0x41, 0x5a, 0x4d}, []uint8{0x41, 0x5a, 0x4e}, []uint8{0x42, 0x41, 0x44}, []uint8{0x42, 0x41, 0x4d}, []uint8{0x42, 0x41, 0x4e}, []uint8{0x42, 0x42, 0x44}, []uint8{0x42, 0x44, 0x54}, []uint8{0x42, 0x45, 0x43}, []uint8{0x42, 0x45, 0x46}, []uint8{0x42, 0x45, 0x4c}, []uint8{0x42, 0x47, 0x4c}, []uint8{0x42, 0x47, 0x4d}, []uint8{0x42, 0x47, 0x4e}, []uint8{0x42, 0x47, 0x4f}, []uint8{0x42, 0x48, 0x44}, []uint8{0x42, 0x49, 0x46}, []uint8{0x42, 0x4d, 0x44}, []uint8{0x42, 0x4e, 0x44}, []uint8{0x42, 0x4f, 0x42}, []uint8{0x42, 0x4f, 0x4c}, []uint8{0x42, 0x4f, 0x50}, []uint8{0x42, 0x4f, 0x56}, []uint8{0x42, 0x52, 0x42}, []uint8{0x42, 0x52, 0x43}, []uint8{0x42, 0x52, 0x45}, []uint8{0x52, 0x24}, []uint8{0x42, 0x52, 0x4e}, []uint8{0x42, 0x52, 0x52}, []uint8{0x42, 0x52, 0x5a}, []uint8{0x42, 0x53, 0x44}, []uint8{0x42, 0x54, 0x4e}, []uint8{0x42, 0x55, 0x4b}, []uint8{0x42, 0x57, 0x50}, []uint8{0x42, 0x59, 0x42}, []uint8{0x42, 0x59, 0x52}, []uint8{0x42, 0x5a, 0x44}, []uint8{0x43, 0x41, 0x24}, []uint8{0x43, 0x44, 0x46}, []uint8{0x43, 0x48, 0x45}, []uint8{0x43, 0x48, 0x46}, []uint8{0x43, 0x48, 0x57}, []uint8{0x43, 0x4c, 0x45}, []uint8{0x43, 0x4c, 0x46}, []uint8{0x43, 0x4c, 0x50}, []uint8{0x43, 0x4e, 0x58}, []uint8{0x43, 0x4e, 0xc2, 0xa5}, []uint8{0x43, 0x4f, 0x50}, []uint8{0x43, 0x4f, 0x55}, []uint8{0x43, 0x52, 0x43}, []uint8{0x43, 0x53, 0x44}, []uint8{0x43, 0x53, 0x4b}, []uint8{0x43, 0x55, 0x43}, []uint8{0x43, 0x55, 0x50}, []uint8{0x43, 0x56, 0x45}, []uint8{0x43, 0x59, 0x50}, []uint8{0x43, 0x5a, 0x4b}, []uint8{0x44, 0x44, 0x4d}, []uint8{0x44, 0x45, 0x4d}, []uint8{0x44, 0x4a, 0x46}, []uint8{0x44, 0x4b, 0x4b}, []uint8{0x44, 0x4f, 0x50}, []uint8{0x44, 0x5a, 0x44}, []uint8{0x45, 0x43, 0x53}, []uint8{0x45, 0x43, 0x56}, []uint8{0x45, 0x45, 0x4b}, []uint8{0x45, 0x47, 0x50}, []uint8{0x45, 0x52, 0x4e}, []uint8{0x45, 0x53, 0x41}, []uint8{0x45, 0x53, 0x42}, []uint8{0xe2, 0x82, 0xa7}, []uint8{0x45, 0x54, 0x42}, []uint8{0xe2, 0x82, 0xac}, []uint8{0x46, 0x49, 0x4d}, []uint8{0x46, 0x4a, 0x44}, []uint8{0x46, 0x4b, 0x50}, []uint8{0x46, 0x52, 0x46}, []uint8{0xc2, 0xa3}, []uint8{0x47, 0x45, 0x4b}, []uint8{0x47, 0x45, 0x4c}, []uint8{0x47, 0x48, 0x43}, []uint8{0x47, 0x48, 0x53}, []uint8{0x47, 0x49, 0x50}, []uint8{0x47, 0x4d, 0x44}, []uint8{0x47, 0x4e, 0x46}, []uint8{0x47, 0x4e, 0x53}, []uint8{0x47, 0x51, 0x45}, []uint8{0x47, 0x52, 0x44}, []uint8{0x47, 0x54, 0x51}, []uint8{0x47, 0x57, 0x45}, []uint8{0x47, 0x57, 0x50}, []uint8{0x47, 0x59, 0x44}, []uint8{0x48, 0x4b, 0x24}, []uint8{0x48, 0x4e, 0x4c}, []uint8{0x48, 0x52, 0x44}, []uint8{0x48, 0x52, 0x4b}, []uint8{0x48, 0x54, 0x47}, []uint8{0x48, 0x55, 0x46}, []uint8{0x49, 0x44, 0x52}, []uint8{0x49, 0x45, 0x50}, []uint8{0x49, 0x4c, 0x50}, []uint8{0x49, 0x4c, 0x52}, []uint8{0xe2, 0x82, 0xaa}, []uint8{0xe2, 0x82, 0xb9}, []uint8{0x49, 0x51, 0x44}, []uint8{0x49, 0x52, 0x52}, []uint8{0x49, 0x53, 0x4a}, []uint8{0x49, 0x53, 0x4b}, []uint8{0x49, 0x54, 0x4c}, []uint8{0x4a, 0x4d, 0x44}, []uint8{0x4a, 0x4f, 0x44}, []uint8{0x4a, 0x50, 0xc2, 0xa5}, []uint8{0x4b, 0x45, 0x53}, []uint8{0x4b, 0x47, 0x53}, []uint8{0x4b, 0x48, 0x52}, []uint8{0x4b, 0x4d, 0x46}, []uint8{0x4b, 0x50, 0x57}, []uint8{0x4b, 0x52, 0x48}, []uint8{0x4b, 0x52, 0x4f}, []uint8{0xe2, 0x82, 0xa9}, []uint8{0x4b, 0x57, 0x44}, []uint8{0x4b, 0x59, 0x44}, []uint8{0x4b, 0x5a, 0x54}, []uint8{0x4c, 0x41, 0x4b}, []uint8{0x4c, 0x42, 0x50}, []uint8{0x4c, 0x4b, 0x52}, []uint8{0x4c, 0x52, 0x44}, []uint8{0x4c, 0x53, 0x4c}, []uint8{0x4c, 0x54, 0x4c}, []uint8{0x4c, 0x54, 0x54}, []uint8{0x4c, 0x55, 0x43}, []uint8{0x4c, 0x55, 0x46}, []uint8{0x4c, 0x55, 0x4c}, []uint8{0x4c, 0x56, 0x4c}, []uint8{0x4c, 0x56, 0x52}, []uint8{0x4c, 0x59, 0x44}, []uint8{0x4d, 0x41, 0x44}, []uint8{0x4d, 0x41, 0x46}, []uint8{0x4d, 0x43, 0x46}, []uint8{0x4d, 0x44, 0x43}, []uint8{0x4d, 0x44, 0x4c}, []uint8{0x4d, 0x47, 0x41}, []uint8{0x4d, 0x47, 0x46}, []uint8{0x4d, 0x4b, 0x44}, []uint8{0x4d, 0x4b, 0x4e}, []uint8{0x4d, 0x4c, 0x46}, []uint8{0x4d, 0x4d, 0x4b}, []uint8{0x4d, 0x4e, 0x54}, []uint8{0x4d, 0x4f, 0x50}, []uint8{0x4d, 0x52, 0x4f}, []uint8{0x4d, 0x54, 0x4c}, []uint8{0x4d, 0x54, 0x50}, []uint8{0x4d, 0x55, 0x52}, []uint8{0x4d, 0x56, 0x50}, []uint8{0x4d, 0x56, 0x52}, []uint8{0x4d, 0x57, 0x4b}, []uint8{0x4d, 0x58, 0x24}, []uint8{0x4d, 0x58, 0x50}, []uint8{0x4d, 0x58, 0x56}, []uint8{0x4d, 0x59, 0x52}, []uint8{0x4d, 0x5a, 0x45}, []uint8{0x4d, 0x5a, 0x4d}, []uint8{0x4d, 0x5a, 0x4e}, []uint8{0x4e, 0x41, 0x44}, []uint8{0x4e, 0x47, 0x4e}, []uint8{0x4e, 0x49, 0x43}, []uint8{0x4e, 0x49, 0x4f}, []uint8{0x4e, 0x4c, 0x47}, []uint8{0x4e, 0x4f, 0x4b}, []uint8{0x4e, 0x50, 0x52}, []uint8{0x4e, 0x5a, 0x24}, []uint8{0x4f, 0x4d, 0x52}, []uint8{0x50, 0x41, 0x42}, []uint8{0x50, 0x45, 0x49}, []uint8{0x50, 0x45, 0x4e}, []uint8{0x50, 0x45, 0x53}, []uint8{0x50, 0x47, 0x4b}, []uint8{0x50, 0x48, 0x50}, []uint8{0x50, 0x4b, 0x52}, []uint8{0x50, 0x4c, 0x4e}, []uint8{0x50, 0x4c, 0x5a}, []uint8{0x50, 0x54, 0x45}, []uint8{0x50, 0x59, 0x47}, []uint8{0x51, 0x41, 0x52}, []uint8{0x52, 0x48, 0x44}, []uint8{0x52, 0x4f, 0x4c}, []uint8{0x52, 0x4f, 0x4e}, []uint8{0x52, 0x53, 0x44}, []uint8{0x52, 0x55, 0x42}, []uint8{0x52, 0x55, 0x52}, []uint8{0x52, 0x57, 0x46}, []uint8{0x53, 0x41, 0x52}, []uint8{0x53, 0x42, 0x44}, []uint8{0x53, 0x43, 0x52}, []uint8{0x53, 0x44, 0x44}, []uint8{0x53, 0x44, 0x47}, []uint8{0x53, 0x44, 0x50}, []uint8{0x53, 0x45, 0x4b}, []uint8{0x53, 0x47, 0x44}, []uint8{0x53, 0x48, 0x50}, []uint8{0x53, 0x49, 0x54}, []uint8{0x53, 0x4b, 0x4b}, []uint8{0x53, 0x4c, 0x4c}, []uint8{0x53, 0x4f, 0x53}, []uint8{0x53, 0x52, 0x44}, []uint8{0x53, 0x52, 0x47}, []uint8{0x53, 0x53, 0x50}, []uint8{0x53, 0x54, 0x44}, []uint8{0x53, 0x55, 0x52}, []uint8{0x53, 0x56, 0x43}, []uint8{0x53, 0x59, 0x50}, []uint8{0x53, 0x5a, 0x4c}, []uint8{0xe0, 0xb8, 0xbf}, []uint8{0x54, 0x4a, 0x52}, []uint8{0x54, 0x4a, 0x53}, []uint8{0x54, 0x4d, 0x4d}, []uint8{0x54, 0x4d, 0x54}, []uint8{0x54, 0x4e, 0x44}, []uint8{0x54, 0x4f, 0x50}, []uint8{0x54, 0x50, 0x45}, []uint8{0x54, 0x52, 0x4c}, []uint8{0x54, 0x52, 0x59}, []uint8{0x54, 0x54, 0x44}, []uint8{0x4e, 0x54, 0x24}, []uint8{0x54, 0x5a, 0x53}, []uint8{0x55, 0x41, 0x48}, []uint8{0x55, 0x41, 0x4b}, []uint8{0x55, 0x47, 0x53}, []uint8{0x55, 0x47, 0x58}, []uint8{0x55, 0x53, 0x24}, []uint8{0x55, 0x53, 0x4e}, []uint8{0x55, 0x53, 0x53}, []uint8{0x55, 0x59, 0x49}, []uint8{0x55, 0x59, 0x50}, []uint8{0x55, 0x59, 0x55}, []uint8{0x55, 0x5a, 0x53}, []uint8{0x56, 0x45, 0x42}, []uint8{0x56, 0x45, 0x46}, []uint8{0xe2, 0x82, 0xab}, []uint8{0x56, 0x4e, 0x4e}, []uint8{0x56, 0x55, 0x56}, []uint8{0x57, 0x53, 0x54}, []uint8{0x46, 0x43, 0x46, 0x41}, []uint8{0x58, 0x41, 0x47}, []uint8{0x58, 0x41, 0x55}, []uint8{0x58, 0x42, 0x41}, []uint8{0x58, 0x42, 0x42}, []uint8{0x58, 0x42, 0x43}, []uint8{0x58, 0x42, 0x44}, []uint8{0x45, 0x43, 0x24}, []uint8{0x58, 0x44, 0x52}, []uint8{0x58, 0x45, 0x55}, []uint8{0x58, 0x46, 0x4f}, []uint8{0x58, 0x46, 0x55}, []uint8{0x43, 0x46, 0x41}, []uint8{0x58, 0x50, 0x44}, []uint8{0x43, 0x46, 0x50, 0x46}, []uint8{0x58, 0x50, 0x54}, []uint8{0x58, 0x52, 0x45}, []uint8{0x58, 0x53, 0x55}, []uint8{0x58, 0x54, 0x53}, []uint8{0x58, 0x55, 0x41}, []uint8{0x58, 0x58, 0x58}, []uint8{0x59, 0x44, 0x44}, []uint8{0x59, 0x45, 0x52}, []uint8{0x59, 0x55, 0x44}, []uint8{0x59, 0x55, 0x4d}, []uint8{0x59, 0x55, 0x4e}, []uint8{0x59, 0x55, 0x52}, []uint8{0x5a, 0x41, 0x4c}, []uint8{0x5a, 0x41, 0x52}, []uint8{0x5a, 0x4d, 0x4b}, []uint8{0x5a, 0x4d, 0x57}, []uint8{0x5a, 0x52, 0x4e}, []uint8{0x5a, 0x52, 0x5a}, []uint8{0x5a, 0x57, 0x44}, []uint8{0x5a, 0x57, 0x4c}, []uint8{0x5a, 0x57, 0x52}}, + 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}, {0x41, 0x4f, 0x41}, {0x41, 0x4f, 0x4b}, {0x41, 0x4f, 0x4e}, {0x41, 0x4f, 0x52}, {0x41, 0x52, 0x41}, {0x41, 0x52, 0x4c}, {0x41, 0x52, 0x4d}, {0x41, 0x52, 0x50}, {0x41, 0x52, 0x53}, {0x41, 0x54, 0x53}, {0x41, 0x24}, {0x41, 0x57, 0x47}, {0x41, 0x5a, 0x4d}, {0x41, 0x5a, 0x4e}, {0x42, 0x41, 0x44}, {0x42, 0x41, 0x4d}, {0x42, 0x41, 0x4e}, {0x42, 0x42, 0x44}, {0x42, 0x44, 0x54}, {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}, {0x42, 0x4d, 0x44}, {0x42, 0x4e, 0x44}, {0x42, 0x4f, 0x42}, {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}, {0x42, 0x53, 0x44}, {0x42, 0x54, 0x4e}, {0x42, 0x55, 0x4b}, {0x42, 0x57, 0x50}, {0x42, 0x59, 0x42}, {0x42, 0x59, 0x52}, {0x42, 0x5a, 0x44}, {0x43, 0x41, 0x24}, {0x43, 0x44, 0x46}, {0x43, 0x48, 0x45}, {0x43, 0x48, 0x46}, {0x43, 0x48, 0x57}, {0x43, 0x4c, 0x45}, {0x43, 0x4c, 0x46}, {0x43, 0x4c, 0x50}, {0x43, 0x4e, 0x58}, {0x43, 0x4e, 0xc2, 0xa5}, {0x43, 0x4f, 0x50}, {0x43, 0x4f, 0x55}, {0x43, 0x52, 0x43}, {0x43, 0x53, 0x44}, {0x43, 0x53, 0x4b}, {0x43, 0x55, 0x43}, {0x43, 0x55, 0x50}, {0x43, 0x56, 0x45}, {0x43, 0x59, 0x50}, {0x43, 0x5a, 0x4b}, {0x44, 0x44, 0x4d}, {0x44, 0x45, 0x4d}, {0x44, 0x4a, 0x46}, {0x44, 0x4b, 0x4b}, {0x44, 0x4f, 0x50}, {0x44, 0x5a, 0x44}, {0x45, 0x43, 0x53}, {0x45, 0x43, 0x56}, {0x45, 0x45, 0x4b}, {0x45, 0x47, 0x50}, {0x45, 0x52, 0x4e}, {0x45, 0x53, 0x41}, {0x45, 0x53, 0x42}, {0xe2, 0x82, 0xa7}, {0x45, 0x54, 0x42}, {0xe2, 0x82, 0xac}, {0x46, 0x49, 0x4d}, {0x46, 0x4a, 0x44}, {0x46, 0x4b, 0x50}, {0x46, 0x52, 0x46}, {0xc2, 0xa3}, {0x47, 0x45, 0x4b}, {0x47, 0x45, 0x4c}, {0x47, 0x48, 0x43}, {0x47, 0x48, 0x53}, {0x47, 0x49, 0x50}, {0x47, 0x4d, 0x44}, {0x47, 0x4e, 0x46}, {0x47, 0x4e, 0x53}, {0x47, 0x51, 0x45}, {0x47, 0x52, 0x44}, {0x47, 0x54, 0x51}, {0x47, 0x57, 0x45}, {0x47, 0x57, 0x50}, {0x47, 0x59, 0x44}, {0x48, 0x4b, 0x24}, {0x48, 0x4e, 0x4c}, {0x48, 0x52, 0x44}, {0x48, 0x52, 0x4b}, {0x48, 0x54, 0x47}, {0x48, 0x55, 0x46}, {0x49, 0x44, 0x52}, {0x49, 0x45, 0x50}, {0x49, 0x4c, 0x50}, {0x49, 0x4c, 0x52}, {0xe2, 0x82, 0xaa}, {0xe2, 0x82, 0xb9}, {0x49, 0x51, 0x44}, {0x49, 0x52, 0x52}, {0x49, 0x53, 0x4a}, {0x49, 0x53, 0x4b}, {0x49, 0x54, 0x4c}, {0x4a, 0x4d, 0x44}, {0x4a, 0x4f, 0x44}, {0x4a, 0x50, 0xc2, 0xa5}, {0x4b, 0x45, 0x53}, {0x4b, 0x47, 0x53}, {0x4b, 0x48, 0x52}, {0x4b, 0x4d, 0x46}, {0x4b, 0x50, 0x57}, {0x4b, 0x52, 0x48}, {0x4b, 0x52, 0x4f}, {0xe2, 0x82, 0xa9}, {0x4b, 0x57, 0x44}, {0x4b, 0x59, 0x44}, {0x4b, 0x5a, 0x54}, {0x4c, 0x41, 0x4b}, {0x4c, 0x42, 0x50}, {0x4c, 0x4b, 0x52}, {0x4c, 0x52, 0x44}, {0x4c, 0x53, 0x4c}, {0x4c, 0x54, 0x4c}, {0x4c, 0x54, 0x54}, {0x4c, 0x55, 0x43}, {0x4c, 0x55, 0x46}, {0x4c, 0x55, 0x4c}, {0x4c, 0x56, 0x4c}, {0x4c, 0x56, 0x52}, {0x4c, 0x59, 0x44}, {0x4d, 0x41, 0x44}, {0x4d, 0x41, 0x46}, {0x4d, 0x43, 0x46}, {0x4d, 0x44, 0x43}, {0x4d, 0x44, 0x4c}, {0x4d, 0x47, 0x41}, {0x4d, 0x47, 0x46}, {0x4d, 0x4b, 0x44}, {0x4d, 0x4b, 0x4e}, {0x4d, 0x4c, 0x46}, {0x4d, 0x4d, 0x4b}, {0x4d, 0x4e, 0x54}, {0x4d, 0x4f, 0x50}, {0x4d, 0x52, 0x4f}, {0x4d, 0x54, 0x4c}, {0x4d, 0x54, 0x50}, {0x4d, 0x55, 0x52}, {0x4d, 0x56, 0x50}, {0x4d, 0x56, 0x52}, {0x4d, 0x57, 0x4b}, {0x4d, 0x58, 0x24}, {0x4d, 0x58, 0x50}, {0x4d, 0x58, 0x56}, {0x4d, 0x59, 0x52}, {0x4d, 0x5a, 0x45}, {0x4d, 0x5a, 0x4d}, {0x4d, 0x5a, 0x4e}, {0x4e, 0x41, 0x44}, {0x4e, 0x47, 0x4e}, {0x4e, 0x49, 0x43}, {0x4e, 0x49, 0x4f}, {0x4e, 0x4c, 0x47}, {0x4e, 0x4f, 0x4b}, {0x4e, 0x50, 0x52}, {0x4e, 0x5a, 0x24}, {0x4f, 0x4d, 0x52}, {0x50, 0x41, 0x42}, {0x50, 0x45, 0x49}, {0x50, 0x45, 0x4e}, {0x50, 0x45, 0x53}, {0x50, 0x47, 0x4b}, {0x50, 0x48, 0x50}, {0x50, 0x4b, 0x52}, {0x50, 0x4c, 0x4e}, {0x50, 0x4c, 0x5a}, {0x50, 0x54, 0x45}, {0x50, 0x59, 0x47}, {0x51, 0x41, 0x52}, {0x52, 0x48, 0x44}, {0x52, 0x4f, 0x4c}, {0x52, 0x4f, 0x4e}, {0x52, 0x53, 0x44}, {0x52, 0x55, 0x42}, {0x52, 0x55, 0x52}, {0x52, 0x57, 0x46}, {0x53, 0x41, 0x52}, {0x53, 0x42, 0x44}, {0x53, 0x43, 0x52}, {0x53, 0x44, 0x44}, {0x53, 0x44, 0x47}, {0x53, 0x44, 0x50}, {0x53, 0x45, 0x4b}, {0x53, 0x47, 0x44}, {0x53, 0x48, 0x50}, {0x53, 0x49, 0x54}, {0x53, 0x4b, 0x4b}, {0x53, 0x4c, 0x4c}, {0x53, 0x4f, 0x53}, {0x53, 0x52, 0x44}, {0x53, 0x52, 0x47}, {0x53, 0x53, 0x50}, {0x53, 0x54, 0x44}, {0x53, 0x55, 0x52}, {0x53, 0x56, 0x43}, {0x53, 0x59, 0x50}, {0x53, 0x5a, 0x4c}, {0xe0, 0xb8, 0xbf}, {0x54, 0x4a, 0x52}, {0x54, 0x4a, 0x53}, {0x54, 0x4d, 0x4d}, {0x54, 0x4d, 0x54}, {0x54, 0x4e, 0x44}, {0x54, 0x4f, 0x50}, {0x54, 0x50, 0x45}, {0x54, 0x52, 0x4c}, {0x54, 0x52, 0x59}, {0x54, 0x54, 0x44}, {0x4e, 0x54, 0x24}, {0x54, 0x5a, 0x53}, {0x55, 0x41, 0x48}, {0x55, 0x41, 0x4b}, {0x55, 0x47, 0x53}, {0x55, 0x47, 0x58}, {0x55, 0x53, 0x24}, {0x55, 0x53, 0x4e}, {0x55, 0x53, 0x53}, {0x55, 0x59, 0x49}, {0x55, 0x59, 0x50}, {0x55, 0x59, 0x55}, {0x55, 0x5a, 0x53}, {0x56, 0x45, 0x42}, {0x56, 0x45, 0x46}, {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}, {0x5a, 0x41, 0x52}, {0x5a, 0x4d, 0x4b}, {0x5a, 0x4d, 0x57}, {0x5a, 0x52, 0x4e}, {0x5a, 0x52, 0x5a}, {0x5a, 0x57, 0x44}, {0x5a, 0x57, 0x4c}, {0x5a, 0x57, 0x52}}, } } @@ -122,17 +122,29 @@ func (eu *eu) FmtNumber(num float64, v uint64) []byte { func (eu *eu) FmtPercent(num float64, v uint64) []byte { s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) - l := len(s) + len(eu.decimal) - + l := len(s) + len(eu.decimal) + len(eu.group)*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] == '.' { b = append(b, eu.decimal[0]) + inWhole = true + continue } + if inWhole { + if count == 3 { + b = append(b, eu.group[0]) + count = 1 + } else { + count++ + } + } + b = append(b, s[i]) } @@ -140,7 +152,11 @@ func (eu *eu) FmtPercent(num float64, v uint64) []byte { b = append(b, eu.minus[0]) } - b = append(b, eu.Percent[0]) + for j := 2 - 1; j >= 0; j-- { + b = append(b, " "[j]) + } + + b = append(b, eu.percent[0]) // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { diff --git a/eu/ue_test.go b/eu/ue_test.go new file mode 100644 index 00000000..c4319792 --- /dev/null +++ b/eu/ue_test.go @@ -0,0 +1,42 @@ +package eu + +import "testing" + +func TestPercent(t *testing.T) { + + tests := []struct { + num float64 + v uint64 + expected string + }{ + { + num: 23, + v: 0, + expected: "%\u00a023", + }, + { + num: 23.45, + v: 2, + expected: "%\u00a023,45", + }, + { + num: 1023.45, + v: 2, + expected: "%\u00a01.023,45", + }, + { + num: -1023.45, + v: 2, + expected: "%\u00a0-1.023,45", + }, + } + + trans := New() + + for _, tt := range tests { + s := string(trans.FmtPercent(tt.num, tt.v)) + if s != tt.expected { + t.Errorf("Expected '%s' Got '%s'", tt.expected, s) + } + } +} diff --git a/eu_ES/eu_ES.go b/eu_ES/eu_ES.go index 9fdacb1e..2a7e555c 100644 --- a/eu_ES/eu_ES.go +++ b/eu_ES/eu_ES.go @@ -122,17 +122,29 @@ func (eu *eu_ES) FmtNumber(num float64, v uint64) []byte { func (eu *eu_ES) FmtPercent(num float64, v uint64) []byte { s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) - l := len(s) + len(eu.decimal) - + l := len(s) + len(eu.decimal) + len(eu.group)*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] == '.' { b = append(b, eu.decimal[0]) + inWhole = true + continue } + if inWhole { + if count == 3 { + b = append(b, eu.group[0]) + count = 1 + } else { + count++ + } + } + b = append(b, s[i]) } @@ -140,7 +152,11 @@ func (eu *eu_ES) FmtPercent(num float64, v uint64) []byte { b = append(b, eu.minus[0]) } - b = append(b, eu.Percent[0]) + for j := 2 - 1; j >= 0; j-- { + b = append(b, " "[j]) + } + + b = append(b, eu.percent[0]) // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { @@ -145,9 +145,7 @@ func (ewo *ewo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ewo.percent) - 1; j >= 0; j-- { - b = append(b, ewo.percent[j]) - } + b = append(b, ewo.percent...) return b } diff --git a/ewo_CM/ewo_CM.go b/ewo_CM/ewo_CM.go index b56f2a41..7061e7cb 100644 --- a/ewo_CM/ewo_CM.go +++ b/ewo_CM/ewo_CM.go @@ -145,9 +145,7 @@ func (ewo *ewo_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ewo.percent) - 1; j >= 0; j-- { - b = append(b, ewo.percent[j]) - } + b = append(b, ewo.percent...) return b } @@ -159,9 +159,7 @@ func (fa *fa) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fa.percent) - 1; j >= 0; j-- { - b = append(b, fa.percent[j]) - } + b = append(b, fa.percent...) return b } diff --git a/fa_AF/fa_AF.go b/fa_AF/fa_AF.go index dc56cac1..93363183 100644 --- a/fa_AF/fa_AF.go +++ b/fa_AF/fa_AF.go @@ -159,9 +159,7 @@ func (fa *fa_AF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fa.percent) - 1; j >= 0; j-- { - b = append(b, fa.percent[j]) - } + b = append(b, fa.percent...) return b } diff --git a/fa_IR/fa_IR.go b/fa_IR/fa_IR.go index 7690f690..0bd3ec41 100644 --- a/fa_IR/fa_IR.go +++ b/fa_IR/fa_IR.go @@ -159,9 +159,7 @@ func (fa *fa_IR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fa.percent) - 1; j >= 0; j-- { - b = append(b, fa.percent[j]) - } + b = append(b, fa.percent...) return b } @@ -153,7 +153,9 @@ func (fi *fi) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fi.Percent[0]) + b = append(b, " "...) + + b = append(b, fi.percent...) return b } diff --git a/fi_FI/fi_FI.go b/fi_FI/fi_FI.go index 120e3bd1..73ce62d9 100644 --- a/fi_FI/fi_FI.go +++ b/fi_FI/fi_FI.go @@ -153,7 +153,9 @@ func (fi *fi_FI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fi.Percent[0]) + b = append(b, " "...) + + b = append(b, fi.percent...) return b } @@ -169,7 +169,7 @@ func (fil *fil) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fil.Percent[0]) + b = append(b, fil.percent...) return b } diff --git a/fil_PH/fil_PH.go b/fil_PH/fil_PH.go index 35ffdacc..1d3faa49 100644 --- a/fil_PH/fil_PH.go +++ b/fil_PH/fil_PH.go @@ -169,7 +169,7 @@ func (fil *fil_PH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fil.Percent[0]) + b = append(b, fil.percent...) return b } @@ -149,7 +149,9 @@ func (fo *fo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fo.Percent[0]) + b = append(b, " "...) + + b = append(b, fo.percent...) return b } diff --git a/fo_DK/fo_DK.go b/fo_DK/fo_DK.go index 7d3a2a55..6cfe1cf5 100644 --- a/fo_DK/fo_DK.go +++ b/fo_DK/fo_DK.go @@ -149,7 +149,9 @@ func (fo *fo_DK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fo.Percent[0]) + b = append(b, " "...) + + b = append(b, fo.percent...) return b } diff --git a/fo_FO/fo_FO.go b/fo_FO/fo_FO.go index 37cf7b21..98854ee2 100644 --- a/fo_FO/fo_FO.go +++ b/fo_FO/fo_FO.go @@ -149,7 +149,9 @@ func (fo *fo_FO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fo.Percent[0]) + b = append(b, " "...) + + b = append(b, fo.percent...) return b } @@ -177,9 +177,9 @@ func (fr *fr) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_BE/fr_BE.go b/fr_BE/fr_BE.go index b12cc6bf..f0c2f801 100644 --- a/fr_BE/fr_BE.go +++ b/fr_BE/fr_BE.go @@ -174,9 +174,9 @@ func (fr *fr_BE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_BF/fr_BF.go b/fr_BF/fr_BF.go index eeadd299..1501fa4e 100644 --- a/fr_BF/fr_BF.go +++ b/fr_BF/fr_BF.go @@ -177,9 +177,9 @@ func (fr *fr_BF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_BI/fr_BI.go b/fr_BI/fr_BI.go index 1e845381..c1d606ac 100644 --- a/fr_BI/fr_BI.go +++ b/fr_BI/fr_BI.go @@ -177,9 +177,9 @@ func (fr *fr_BI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_BJ/fr_BJ.go b/fr_BJ/fr_BJ.go index b0f511c0..93f6698b 100644 --- a/fr_BJ/fr_BJ.go +++ b/fr_BJ/fr_BJ.go @@ -177,9 +177,9 @@ func (fr *fr_BJ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_BL/fr_BL.go b/fr_BL/fr_BL.go index 2c4d9b1b..af023269 100644 --- a/fr_BL/fr_BL.go +++ b/fr_BL/fr_BL.go @@ -177,9 +177,9 @@ func (fr *fr_BL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_CA/fr_CA.go b/fr_CA/fr_CA.go index 51b8bf71..c441f156 100644 --- a/fr_CA/fr_CA.go +++ b/fr_CA/fr_CA.go @@ -177,9 +177,9 @@ func (fr *fr_CA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_CD/fr_CD.go b/fr_CD/fr_CD.go index 0a8a8b8a..8cdc281d 100644 --- a/fr_CD/fr_CD.go +++ b/fr_CD/fr_CD.go @@ -177,9 +177,9 @@ func (fr *fr_CD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_CF/fr_CF.go b/fr_CF/fr_CF.go index 4af95843..3b6a0e43 100644 --- a/fr_CF/fr_CF.go +++ b/fr_CF/fr_CF.go @@ -177,9 +177,9 @@ func (fr *fr_CF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_CG/fr_CG.go b/fr_CG/fr_CG.go index b7c78a97..acbcfb49 100644 --- a/fr_CG/fr_CG.go +++ b/fr_CG/fr_CG.go @@ -177,9 +177,9 @@ func (fr *fr_CG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_CH/fr_CH.go b/fr_CH/fr_CH.go index 7aecfe1b..2739ba08 100644 --- a/fr_CH/fr_CH.go +++ b/fr_CH/fr_CH.go @@ -171,9 +171,7 @@ func (fr *fr_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, fr.percent...) return b } diff --git a/fr_CI/fr_CI.go b/fr_CI/fr_CI.go index 7859b121..98a9a47f 100644 --- a/fr_CI/fr_CI.go +++ b/fr_CI/fr_CI.go @@ -177,9 +177,9 @@ func (fr *fr_CI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_CM/fr_CM.go b/fr_CM/fr_CM.go index df8ae8e6..1d5cc7c5 100644 --- a/fr_CM/fr_CM.go +++ b/fr_CM/fr_CM.go @@ -177,9 +177,9 @@ func (fr *fr_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_DJ/fr_DJ.go b/fr_DJ/fr_DJ.go index f587f9b1..fca7a4b1 100644 --- a/fr_DJ/fr_DJ.go +++ b/fr_DJ/fr_DJ.go @@ -177,9 +177,9 @@ func (fr *fr_DJ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_DZ/fr_DZ.go b/fr_DZ/fr_DZ.go index 5ba23673..cbc8c4c5 100644 --- a/fr_DZ/fr_DZ.go +++ b/fr_DZ/fr_DZ.go @@ -177,9 +177,9 @@ func (fr *fr_DZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_FR/fr_FR.go b/fr_FR/fr_FR.go index eaf24599..7c9b3ea3 100644 --- a/fr_FR/fr_FR.go +++ b/fr_FR/fr_FR.go @@ -177,9 +177,9 @@ func (fr *fr_FR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_GA/fr_GA.go b/fr_GA/fr_GA.go index ddfcb2bf..f18b0050 100644 --- a/fr_GA/fr_GA.go +++ b/fr_GA/fr_GA.go @@ -177,9 +177,9 @@ func (fr *fr_GA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_GF/fr_GF.go b/fr_GF/fr_GF.go index d1566cc8..54d44d39 100644 --- a/fr_GF/fr_GF.go +++ b/fr_GF/fr_GF.go @@ -177,9 +177,9 @@ func (fr *fr_GF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_GN/fr_GN.go b/fr_GN/fr_GN.go index 8b6f1a71..00c3efd9 100644 --- a/fr_GN/fr_GN.go +++ b/fr_GN/fr_GN.go @@ -177,9 +177,9 @@ func (fr *fr_GN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_GP/fr_GP.go b/fr_GP/fr_GP.go index 3f57cbf8..d0de70d3 100644 --- a/fr_GP/fr_GP.go +++ b/fr_GP/fr_GP.go @@ -177,9 +177,9 @@ func (fr *fr_GP) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_GQ/fr_GQ.go b/fr_GQ/fr_GQ.go index 6b0da5ab..e6a8f102 100644 --- a/fr_GQ/fr_GQ.go +++ b/fr_GQ/fr_GQ.go @@ -177,9 +177,9 @@ func (fr *fr_GQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_HT/fr_HT.go b/fr_HT/fr_HT.go index 01de250e..225ec867 100644 --- a/fr_HT/fr_HT.go +++ b/fr_HT/fr_HT.go @@ -177,9 +177,9 @@ func (fr *fr_HT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_KM/fr_KM.go b/fr_KM/fr_KM.go index b0c5c2df..9f0817b0 100644 --- a/fr_KM/fr_KM.go +++ b/fr_KM/fr_KM.go @@ -177,9 +177,9 @@ func (fr *fr_KM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_LU/fr_LU.go b/fr_LU/fr_LU.go index 78d1e1f0..6be5d796 100644 --- a/fr_LU/fr_LU.go +++ b/fr_LU/fr_LU.go @@ -174,9 +174,9 @@ func (fr *fr_LU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MA/fr_MA.go b/fr_MA/fr_MA.go index 1ad3a41b..664965ef 100644 --- a/fr_MA/fr_MA.go +++ b/fr_MA/fr_MA.go @@ -174,9 +174,9 @@ func (fr *fr_MA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MC/fr_MC.go b/fr_MC/fr_MC.go index 3d251418..f821321e 100644 --- a/fr_MC/fr_MC.go +++ b/fr_MC/fr_MC.go @@ -177,9 +177,9 @@ func (fr *fr_MC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MF/fr_MF.go b/fr_MF/fr_MF.go index abf90c9a..d94e52eb 100644 --- a/fr_MF/fr_MF.go +++ b/fr_MF/fr_MF.go @@ -177,9 +177,9 @@ func (fr *fr_MF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MG/fr_MG.go b/fr_MG/fr_MG.go index a099a3b0..dd96c5ec 100644 --- a/fr_MG/fr_MG.go +++ b/fr_MG/fr_MG.go @@ -177,9 +177,9 @@ func (fr *fr_MG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_ML/fr_ML.go b/fr_ML/fr_ML.go index d2f7f723..abaf47b7 100644 --- a/fr_ML/fr_ML.go +++ b/fr_ML/fr_ML.go @@ -177,9 +177,9 @@ func (fr *fr_ML) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MQ/fr_MQ.go b/fr_MQ/fr_MQ.go index 050bba78..f0c471c1 100644 --- a/fr_MQ/fr_MQ.go +++ b/fr_MQ/fr_MQ.go @@ -177,9 +177,9 @@ func (fr *fr_MQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MR/fr_MR.go b/fr_MR/fr_MR.go index 1e848e62..8b9f1c53 100644 --- a/fr_MR/fr_MR.go +++ b/fr_MR/fr_MR.go @@ -177,9 +177,9 @@ func (fr *fr_MR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_MU/fr_MU.go b/fr_MU/fr_MU.go index fed1ea57..f3909612 100644 --- a/fr_MU/fr_MU.go +++ b/fr_MU/fr_MU.go @@ -177,9 +177,9 @@ func (fr *fr_MU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_NC/fr_NC.go b/fr_NC/fr_NC.go index 3effb97d..112d4a93 100644 --- a/fr_NC/fr_NC.go +++ b/fr_NC/fr_NC.go @@ -177,9 +177,9 @@ func (fr *fr_NC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_NE/fr_NE.go b/fr_NE/fr_NE.go index 039949ee..c7216b75 100644 --- a/fr_NE/fr_NE.go +++ b/fr_NE/fr_NE.go @@ -177,9 +177,9 @@ func (fr *fr_NE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_PF/fr_PF.go b/fr_PF/fr_PF.go index fd4d7ead..e7545edd 100644 --- a/fr_PF/fr_PF.go +++ b/fr_PF/fr_PF.go @@ -177,9 +177,9 @@ func (fr *fr_PF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_PM/fr_PM.go b/fr_PM/fr_PM.go index 4ade7d19..ef82e59d 100644 --- a/fr_PM/fr_PM.go +++ b/fr_PM/fr_PM.go @@ -177,9 +177,9 @@ func (fr *fr_PM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_RE/fr_RE.go b/fr_RE/fr_RE.go index c093cc76..5d49c20c 100644 --- a/fr_RE/fr_RE.go +++ b/fr_RE/fr_RE.go @@ -177,9 +177,9 @@ func (fr *fr_RE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_RW/fr_RW.go b/fr_RW/fr_RW.go index e2b64631..eda8f1e6 100644 --- a/fr_RW/fr_RW.go +++ b/fr_RW/fr_RW.go @@ -177,9 +177,9 @@ func (fr *fr_RW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_SC/fr_SC.go b/fr_SC/fr_SC.go index 4ac3fede..e9ac5f6a 100644 --- a/fr_SC/fr_SC.go +++ b/fr_SC/fr_SC.go @@ -177,9 +177,9 @@ func (fr *fr_SC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_SN/fr_SN.go b/fr_SN/fr_SN.go index 6c0b1552..78c4f706 100644 --- a/fr_SN/fr_SN.go +++ b/fr_SN/fr_SN.go @@ -177,9 +177,9 @@ func (fr *fr_SN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_SY/fr_SY.go b/fr_SY/fr_SY.go index 0d9596ec..98579031 100644 --- a/fr_SY/fr_SY.go +++ b/fr_SY/fr_SY.go @@ -177,9 +177,9 @@ func (fr *fr_SY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_TD/fr_TD.go b/fr_TD/fr_TD.go index dfe75855..861d4e05 100644 --- a/fr_TD/fr_TD.go +++ b/fr_TD/fr_TD.go @@ -177,9 +177,9 @@ func (fr *fr_TD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_TG/fr_TG.go b/fr_TG/fr_TG.go index 5ca59b6b..3495c21c 100644 --- a/fr_TG/fr_TG.go +++ b/fr_TG/fr_TG.go @@ -177,9 +177,9 @@ func (fr *fr_TG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_TN/fr_TN.go b/fr_TN/fr_TN.go index 148f808e..3f07d43b 100644 --- a/fr_TN/fr_TN.go +++ b/fr_TN/fr_TN.go @@ -177,9 +177,9 @@ func (fr *fr_TN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_VU/fr_VU.go b/fr_VU/fr_VU.go index b5096058..18cd28fd 100644 --- a/fr_VU/fr_VU.go +++ b/fr_VU/fr_VU.go @@ -177,9 +177,9 @@ func (fr *fr_VU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_WF/fr_WF.go b/fr_WF/fr_WF.go index 84285bf8..37d1b4f0 100644 --- a/fr_WF/fr_WF.go +++ b/fr_WF/fr_WF.go @@ -177,9 +177,9 @@ func (fr *fr_WF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } diff --git a/fr_YT/fr_YT.go b/fr_YT/fr_YT.go index 7ed93546..1fb536c9 100644 --- a/fr_YT/fr_YT.go +++ b/fr_YT/fr_YT.go @@ -177,9 +177,9 @@ func (fr *fr_YT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(fr.percent) - 1; j >= 0; j-- { - b = append(b, fr.percent[j]) - } + b = append(b, " "...) + + b = append(b, fr.percent...) return b } @@ -145,7 +145,7 @@ func (fur *fur) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fur.Percent[0]) + b = append(b, fur.percent...) return b } diff --git a/fur_IT/fur_IT.go b/fur_IT/fur_IT.go index c6752f39..3025347f 100644 --- a/fur_IT/fur_IT.go +++ b/fur_IT/fur_IT.go @@ -145,7 +145,7 @@ func (fur *fur_IT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fur.Percent[0]) + b = append(b, fur.percent...) return b } @@ -146,7 +146,7 @@ func (fy *fy) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fy.Percent[0]) + b = append(b, fy.percent...) return b } diff --git a/fy_NL/fy_NL.go b/fy_NL/fy_NL.go index b0ce3765..bb8f8524 100644 --- a/fy_NL/fy_NL.go +++ b/fy_NL/fy_NL.go @@ -146,7 +146,7 @@ func (fy *fy_NL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, fy.Percent[0]) + b = append(b, fy.percent...) return b } @@ -158,7 +158,7 @@ func (ga *ga) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ga.Percent[0]) + b = append(b, ga.percent...) return b } diff --git a/ga_IE/ga_IE.go b/ga_IE/ga_IE.go index 5fcf6f52..ae33fd2d 100644 --- a/ga_IE/ga_IE.go +++ b/ga_IE/ga_IE.go @@ -158,7 +158,7 @@ func (ga *ga_IE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ga.Percent[0]) + b = append(b, ga.percent...) return b } @@ -162,9 +162,7 @@ func (gd *gd) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(gd.percent) - 1; j >= 0; j-- { - b = append(b, gd.percent[j]) - } + b = append(b, gd.percent...) return b } diff --git a/gd_GB/gd_GB.go b/gd_GB/gd_GB.go index 2ec35780..994555d3 100644 --- a/gd_GB/gd_GB.go +++ b/gd_GB/gd_GB.go @@ -162,9 +162,7 @@ func (gd *gd_GB) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(gd.percent) - 1; j >= 0; j-- { - b = append(b, gd.percent[j]) - } + b = append(b, gd.percent...) return b } @@ -157,7 +157,7 @@ func (gl *gl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, gl.Percent[0]) + b = append(b, gl.percent...) return b } diff --git a/gl_ES/gl_ES.go b/gl_ES/gl_ES.go index a56c161b..98894a83 100644 --- a/gl_ES/gl_ES.go +++ b/gl_ES/gl_ES.go @@ -157,7 +157,7 @@ func (gl *gl_ES) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, gl.Percent[0]) + b = append(b, gl.percent...) return b } @@ -152,7 +152,9 @@ func (gsw *gsw) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, gsw.Percent[0]) + b = append(b, " "...) + + b = append(b, gsw.percent...) return b } diff --git a/gsw_CH/gsw_CH.go b/gsw_CH/gsw_CH.go index 4ae64261..fd4bd468 100644 --- a/gsw_CH/gsw_CH.go +++ b/gsw_CH/gsw_CH.go @@ -152,7 +152,9 @@ func (gsw *gsw_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, gsw.Percent[0]) + b = append(b, " "...) + + b = append(b, gsw.percent...) return b } diff --git a/gsw_FR/gsw_FR.go b/gsw_FR/gsw_FR.go index cb100a02..60c3f967 100644 --- a/gsw_FR/gsw_FR.go +++ b/gsw_FR/gsw_FR.go @@ -152,7 +152,9 @@ func (gsw *gsw_FR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, gsw.Percent[0]) + b = append(b, " "...) + + b = append(b, gsw.percent...) return b } diff --git a/gsw_LI/gsw_LI.go b/gsw_LI/gsw_LI.go index fbc31abd..22e40d9d 100644 --- a/gsw_LI/gsw_LI.go +++ b/gsw_LI/gsw_LI.go @@ -152,7 +152,9 @@ func (gsw *gsw_LI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, gsw.Percent[0]) + b = append(b, " "...) + + b = append(b, gsw.percent...) return b } @@ -192,9 +192,7 @@ func (gu *gu) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(gu.percent) - 1; j >= 0; j-- { - b = append(b, gu.percent[j]) - } + b = append(b, gu.percent...) return b } diff --git a/gu_IN/gu_IN.go b/gu_IN/gu_IN.go index 0342ceee..bdf99f46 100644 --- a/gu_IN/gu_IN.go +++ b/gu_IN/gu_IN.go @@ -192,9 +192,7 @@ func (gu *gu_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(gu.percent) - 1; j >= 0; j-- { - b = append(b, gu.percent[j]) - } + b = append(b, gu.percent...) return b } @@ -149,9 +149,7 @@ func (ha *ha) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ha.percent) - 1; j >= 0; j-- { - b = append(b, ha.percent[j]) - } + b = append(b, ha.percent...) return b } diff --git a/ha_GH/ha_GH.go b/ha_GH/ha_GH.go index ac90020f..373223ba 100644 --- a/ha_GH/ha_GH.go +++ b/ha_GH/ha_GH.go @@ -149,9 +149,7 @@ func (ha *ha_GH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ha.percent) - 1; j >= 0; j-- { - b = append(b, ha.percent[j]) - } + b = append(b, ha.percent...) return b } diff --git a/ha_NE/ha_NE.go b/ha_NE/ha_NE.go index 8b16b9c7..f0b62220 100644 --- a/ha_NE/ha_NE.go +++ b/ha_NE/ha_NE.go @@ -149,9 +149,7 @@ func (ha *ha_NE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ha.percent) - 1; j >= 0; j-- { - b = append(b, ha.percent[j]) - } + b = append(b, ha.percent...) return b } diff --git a/ha_NG/ha_NG.go b/ha_NG/ha_NG.go index 15e7cc3e..abddfda7 100644 --- a/ha_NG/ha_NG.go +++ b/ha_NG/ha_NG.go @@ -149,9 +149,7 @@ func (ha *ha_NG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(ha.percent) - 1; j >= 0; j-- { - b = append(b, ha.percent[j]) - } + b = append(b, ha.percent...) return b } @@ -182,7 +182,7 @@ func (he *he) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, he.Percent[0]) + b = append(b, he.percent...) return b } diff --git a/he_IL/he_IL.go b/he_IL/he_IL.go index 70ce6569..18c985a3 100644 --- a/he_IL/he_IL.go +++ b/he_IL/he_IL.go @@ -182,7 +182,7 @@ func (he *he_IL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, he.Percent[0]) + b = append(b, he.percent...) return b } @@ -179,7 +179,7 @@ func (hi *hi) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hi.Percent[0]) + b = append(b, hi.percent...) return b } diff --git a/hi_IN/hi_IN.go b/hi_IN/hi_IN.go index 36f2d406..e0e0097d 100644 --- a/hi_IN/hi_IN.go +++ b/hi_IN/hi_IN.go @@ -179,7 +179,7 @@ func (hi *hi_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hi.Percent[0]) + b = append(b, hi.percent...) return b } @@ -176,7 +176,7 @@ func (hr *hr) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hr.Percent[0]) + b = append(b, hr.percent...) return b } diff --git a/hr_BA/hr_BA.go b/hr_BA/hr_BA.go index 6b35f8ce..3c1afad5 100644 --- a/hr_BA/hr_BA.go +++ b/hr_BA/hr_BA.go @@ -176,7 +176,7 @@ func (hr *hr_BA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hr.Percent[0]) + b = append(b, hr.percent...) return b } diff --git a/hr_HR/hr_HR.go b/hr_HR/hr_HR.go index 1419129c..b0f4c1a3 100644 --- a/hr_HR/hr_HR.go +++ b/hr_HR/hr_HR.go @@ -57,8 +57,8 @@ func (hr *hr_HR) CardinalPluralRule(num float64, v uint64) locales.PluralRule { f := locales.F(n, v) iMod10 := i % 10 iMod100 := i % 100 - fMod10 := f % 10 fMod100 := f % 100 + fMod10 := f % 10 if (v == 0 && iMod10 == 1 && iMod100 != 11) || (fMod10 == 1 && fMod100 != 11) { return locales.PluralRuleOne @@ -176,7 +176,7 @@ func (hr *hr_HR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hr.Percent[0]) + b = append(b, hr.percent...) return b } @@ -153,7 +153,9 @@ func (hsb *hsb) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hsb.Percent[0]) + b = append(b, " "...) + + b = append(b, hsb.percent...) return b } diff --git a/hsb_DE/hsb_DE.go b/hsb_DE/hsb_DE.go index f78f8e6a..d74c4476 100644 --- a/hsb_DE/hsb_DE.go +++ b/hsb_DE/hsb_DE.go @@ -153,7 +153,9 @@ func (hsb *hsb_DE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hsb.Percent[0]) + b = append(b, " "...) + + b = append(b, hsb.percent...) return b } @@ -166,7 +166,7 @@ func (hu *hu) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hu.Percent[0]) + b = append(b, hu.percent...) return b } diff --git a/hu_HU/hu_HU.go b/hu_HU/hu_HU.go index 12392254..e8d30084 100644 --- a/hu_HU/hu_HU.go +++ b/hu_HU/hu_HU.go @@ -166,7 +166,7 @@ func (hu *hu_HU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hu.Percent[0]) + b = append(b, hu.percent...) return b } @@ -152,7 +152,7 @@ func (hy *hy) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hy.Percent[0]) + b = append(b, hy.percent...) return b } diff --git a/hy_AM/hy_AM.go b/hy_AM/hy_AM.go index a5746a0a..78c0f9d8 100644 --- a/hy_AM/hy_AM.go +++ b/hy_AM/hy_AM.go @@ -152,7 +152,7 @@ func (hy *hy_AM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, hy.Percent[0]) + b = append(b, hy.percent...) return b } @@ -138,7 +138,7 @@ func (id *id) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, id.Percent[0]) + b = append(b, id.percent...) return b } diff --git a/id_ID/id_ID.go b/id_ID/id_ID.go index cad59254..73d0103c 100644 --- a/id_ID/id_ID.go +++ b/id_ID/id_ID.go @@ -138,7 +138,7 @@ func (id *id_ID) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, id.Percent[0]) + b = append(b, id.percent...) return b } @@ -162,7 +162,7 @@ func (is *is) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, is.Percent[0]) + b = append(b, is.percent...) return b } diff --git a/is_IS/is_IS.go b/is_IS/is_IS.go index 5a925c7d..338ca096 100644 --- a/is_IS/is_IS.go +++ b/is_IS/is_IS.go @@ -162,7 +162,7 @@ func (is *is_IS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, is.Percent[0]) + b = append(b, is.percent...) return b } @@ -164,7 +164,7 @@ func (it *it) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, it.Percent[0]) + b = append(b, it.percent...) return b } diff --git a/it_CH/it_CH.go b/it_CH/it_CH.go index 90763299..58b066f7 100644 --- a/it_CH/it_CH.go +++ b/it_CH/it_CH.go @@ -164,7 +164,7 @@ func (it *it_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, it.Percent[0]) + b = append(b, it.percent...) return b } diff --git a/it_IT/it_IT.go b/it_IT/it_IT.go index 6a8ff711..f0e2746b 100644 --- a/it_IT/it_IT.go +++ b/it_IT/it_IT.go @@ -164,7 +164,7 @@ func (it *it_IT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, it.Percent[0]) + b = append(b, it.percent...) return b } diff --git a/it_SM/it_SM.go b/it_SM/it_SM.go index 397577f7..b19a5284 100644 --- a/it_SM/it_SM.go +++ b/it_SM/it_SM.go @@ -164,7 +164,7 @@ func (it *it_SM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, it.Percent[0]) + b = append(b, it.percent...) return b } @@ -138,7 +138,7 @@ func (ja *ja) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ja.Percent[0]) + b = append(b, ja.percent...) return b } diff --git a/ja_JP/ja_JP.go b/ja_JP/ja_JP.go index 5868faaa..3422d8d6 100644 --- a/ja_JP/ja_JP.go +++ b/ja_JP/ja_JP.go @@ -138,7 +138,7 @@ func (ja *ja_JP) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ja.Percent[0]) + b = append(b, ja.percent...) return b } @@ -145,7 +145,7 @@ func (jgo *jgo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, jgo.Percent[0]) + b = append(b, jgo.percent...) return b } diff --git a/jgo_CM/jgo_CM.go b/jgo_CM/jgo_CM.go index 3b8c3ae4..91a3ff2f 100644 --- a/jgo_CM/jgo_CM.go +++ b/jgo_CM/jgo_CM.go @@ -145,7 +145,7 @@ func (jgo *jgo_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, jgo.Percent[0]) + b = append(b, jgo.percent...) return b } @@ -170,7 +170,9 @@ func (ka *ka) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ka.Percent[0]) + b = append(b, " "...) + + b = append(b, ka.percent...) return b } diff --git a/ka_GE/ka_GE.go b/ka_GE/ka_GE.go index 1a82bc05..50fee38d 100644 --- a/ka_GE/ka_GE.go +++ b/ka_GE/ka_GE.go @@ -170,7 +170,9 @@ func (ka *ka_GE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ka.Percent[0]) + b = append(b, " "...) + + b = append(b, ka.percent...) return b } @@ -141,7 +141,7 @@ func (kea *kea) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kea.Percent[0]) + b = append(b, kea.percent...) return b } diff --git a/kea_CV/kea_CV.go b/kea_CV/kea_CV.go index db41fc98..31dcc5e3 100644 --- a/kea_CV/kea_CV.go +++ b/kea_CV/kea_CV.go @@ -141,7 +141,7 @@ func (kea *kea_CV) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kea.Percent[0]) + b = append(b, kea.percent...) return b } @@ -167,7 +167,7 @@ func (kk *kk) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kk.Percent[0]) + b = append(b, kk.percent...) return b } diff --git a/kk_KZ/kk_KZ.go b/kk_KZ/kk_KZ.go index ba8a7b76..9a98e9ea 100644 --- a/kk_KZ/kk_KZ.go +++ b/kk_KZ/kk_KZ.go @@ -167,7 +167,7 @@ func (kk *kk_KZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kk.Percent[0]) + b = append(b, kk.percent...) return b } @@ -145,7 +145,9 @@ func (kl *kl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kl.Percent[0]) + b = append(b, " "...) + + b = append(b, kl.percent...) return b } diff --git a/kl_GL/kl_GL.go b/kl_GL/kl_GL.go index ca0ba389..86931669 100644 --- a/kl_GL/kl_GL.go +++ b/kl_GL/kl_GL.go @@ -145,7 +145,9 @@ func (kl *kl_GL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kl.Percent[0]) + b = append(b, " "...) + + b = append(b, kl.percent...) return b } @@ -138,7 +138,7 @@ func (km *km) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, km.Percent[0]) + b = append(b, km.percent...) return b } diff --git a/km_KH/km_KH.go b/km_KH/km_KH.go index c4e353a3..058a433f 100644 --- a/km_KH/km_KH.go +++ b/km_KH/km_KH.go @@ -138,7 +138,7 @@ func (km *km_KH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, km.Percent[0]) + b = append(b, km.percent...) return b } @@ -157,7 +157,7 @@ func (kn *kn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kn.Percent[0]) + b = append(b, kn.percent...) return b } diff --git a/kn_IN/kn_IN.go b/kn_IN/kn_IN.go index cb1d2c18..84e85f49 100644 --- a/kn_IN/kn_IN.go +++ b/kn_IN/kn_IN.go @@ -157,7 +157,7 @@ func (kn *kn_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, kn.Percent[0]) + b = append(b, kn.percent...) return b } @@ -138,7 +138,7 @@ func (ko *ko) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ko.Percent[0]) + b = append(b, ko.percent...) return b } diff --git a/ko_KP/ko_KP.go b/ko_KP/ko_KP.go index e02c38c5..e2347f9b 100644 --- a/ko_KP/ko_KP.go +++ b/ko_KP/ko_KP.go @@ -138,7 +138,7 @@ func (ko *ko_KP) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ko.Percent[0]) + b = append(b, ko.percent...) return b } diff --git a/ko_KR/ko_KR.go b/ko_KR/ko_KR.go index d8be162c..704b236c 100644 --- a/ko_KR/ko_KR.go +++ b/ko_KR/ko_KR.go @@ -138,7 +138,7 @@ func (ko *ko_KR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ko.Percent[0]) + b = append(b, ko.percent...) return b } @@ -160,9 +160,7 @@ func (kok *kok) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(kok.percent) - 1; j >= 0; j-- { - b = append(b, kok.percent[j]) - } + b = append(b, kok.percent...) return b } diff --git a/kok_IN/kok_IN.go b/kok_IN/kok_IN.go index 4d6e67e6..edc0ac2e 100644 --- a/kok_IN/kok_IN.go +++ b/kok_IN/kok_IN.go @@ -160,9 +160,7 @@ func (kok *kok_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(kok.percent) - 1; j >= 0; j-- { - b = append(b, kok.percent[j]) - } + b = append(b, kok.percent...) return b } @@ -158,7 +158,7 @@ func (ks *ks) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ks.Percent[0]) + b = append(b, ks.percent...) return b } diff --git a/ks_IN/ks_IN.go b/ks_IN/ks_IN.go index 8afad801..def88194 100644 --- a/ks_IN/ks_IN.go +++ b/ks_IN/ks_IN.go @@ -158,7 +158,7 @@ func (ks *ks_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ks.Percent[0]) + b = append(b, ks.percent...) return b } @@ -154,7 +154,9 @@ func (ksh *ksh) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ksh.Percent[0]) + b = append(b, " "...) + + b = append(b, ksh.percent...) return b } diff --git a/ksh_DE/ksh_DE.go b/ksh_DE/ksh_DE.go index 9b39d148..de9301cd 100644 --- a/ksh_DE/ksh_DE.go +++ b/ksh_DE/ksh_DE.go @@ -154,7 +154,9 @@ func (ksh *ksh_DE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ksh.Percent[0]) + b = append(b, " "...) + + b = append(b, ksh.percent...) return b } @@ -159,7 +159,7 @@ func (ky *ky) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ky.Percent[0]) + b = append(b, ky.percent...) return b } diff --git a/ky_KG/ky_KG.go b/ky_KG/ky_KG.go index 039b27bb..ddf86f3e 100644 --- a/ky_KG/ky_KG.go +++ b/ky_KG/ky_KG.go @@ -159,7 +159,7 @@ func (ky *ky_KG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ky.Percent[0]) + b = append(b, ky.percent...) return b } @@ -145,7 +145,9 @@ func (lb *lb) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lb.Percent[0]) + b = append(b, " "...) + + b = append(b, lb.percent...) return b } diff --git a/lb_LU/lb_LU.go b/lb_LU/lb_LU.go index d7f840cc..29efa8e8 100644 --- a/lb_LU/lb_LU.go +++ b/lb_LU/lb_LU.go @@ -145,7 +145,9 @@ func (lb *lb_LU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lb.Percent[0]) + b = append(b, " "...) + + b = append(b, lb.percent...) return b } @@ -110,7 +110,7 @@ func (lo *lo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lo.Percent[0]) + b = append(b, lo.percent...) return b } diff --git a/lo_LA/lo_LA.go b/lo_LA/lo_LA.go index a6943561..5ae5c7c0 100644 --- a/lo_LA/lo_LA.go +++ b/lo_LA/lo_LA.go @@ -110,7 +110,7 @@ func (lo *lo_LA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lo.Percent[0]) + b = append(b, lo.percent...) return b } @@ -138,7 +138,7 @@ func (lrc *lrc) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lrc.Percent[0]) + b = append(b, lrc.percent...) return b } diff --git a/lrc_IQ/lrc_IQ.go b/lrc_IQ/lrc_IQ.go index 5a422f6c..cb0456b2 100644 --- a/lrc_IQ/lrc_IQ.go +++ b/lrc_IQ/lrc_IQ.go @@ -138,7 +138,7 @@ func (lrc *lrc_IQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lrc.Percent[0]) + b = append(b, lrc.percent...) return b } diff --git a/lrc_IR/lrc_IR.go b/lrc_IR/lrc_IR.go index 086d7edd..96cc785a 100644 --- a/lrc_IR/lrc_IR.go +++ b/lrc_IR/lrc_IR.go @@ -138,7 +138,7 @@ func (lrc *lrc_IR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lrc.Percent[0]) + b = append(b, lrc.percent...) return b } @@ -196,7 +196,9 @@ func (lt *lt) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lt.Percent[0]) + b = append(b, " "...) + + b = append(b, lt.percent...) return b } diff --git a/lt_LT/lt_LT.go b/lt_LT/lt_LT.go index 955ba6cb..3c6cd872 100644 --- a/lt_LT/lt_LT.go +++ b/lt_LT/lt_LT.go @@ -196,7 +196,9 @@ func (lt *lt_LT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lt.Percent[0]) + b = append(b, " "...) + + b = append(b, lt.percent...) return b } @@ -54,8 +54,8 @@ func (lv *lv) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) f := locales.F(n, v) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) fMod100 := f % 100 fMod10 := f % 10 @@ -178,7 +178,7 @@ func (lv *lv) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lv.Percent[0]) + b = append(b, lv.percent...) return b } diff --git a/lv_LV/lv_LV.go b/lv_LV/lv_LV.go index 2a6d5eb9..686a1728 100644 --- a/lv_LV/lv_LV.go +++ b/lv_LV/lv_LV.go @@ -178,7 +178,7 @@ func (lv *lv_LV) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, lv.Percent[0]) + b = append(b, lv.percent...) return b } @@ -145,7 +145,7 @@ func (mgo *mgo) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mgo.Percent[0]) + b = append(b, mgo.percent...) return b } diff --git a/mgo_CM/mgo_CM.go b/mgo_CM/mgo_CM.go index 01e5ac9f..e78b5a96 100644 --- a/mgo_CM/mgo_CM.go +++ b/mgo_CM/mgo_CM.go @@ -145,7 +145,7 @@ func (mgo *mgo_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mgo.Percent[0]) + b = append(b, mgo.percent...) return b } @@ -163,7 +163,7 @@ func (mk *mk) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mk.Percent[0]) + b = append(b, mk.percent...) return b } diff --git a/mk_MK/mk_MK.go b/mk_MK/mk_MK.go index a1feb2b0..6cd3d4ca 100644 --- a/mk_MK/mk_MK.go +++ b/mk_MK/mk_MK.go @@ -163,7 +163,7 @@ func (mk *mk_MK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mk.Percent[0]) + b = append(b, mk.percent...) return b } @@ -165,7 +165,7 @@ func (ml *ml) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ml.Percent[0]) + b = append(b, ml.percent...) return b } diff --git a/ml_IN/ml_IN.go b/ml_IN/ml_IN.go index da468392..1e94e295 100644 --- a/ml_IN/ml_IN.go +++ b/ml_IN/ml_IN.go @@ -165,7 +165,7 @@ func (ml *ml_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ml.Percent[0]) + b = append(b, ml.percent...) return b } @@ -156,7 +156,7 @@ func (mn *mn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mn.Percent[0]) + b = append(b, mn.percent...) return b } diff --git a/mn_MN/mn_MN.go b/mn_MN/mn_MN.go index b1d1fdaf..78454ad4 100644 --- a/mn_MN/mn_MN.go +++ b/mn_MN/mn_MN.go @@ -156,7 +156,7 @@ func (mn *mn_MN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mn.Percent[0]) + b = append(b, mn.percent...) return b } @@ -177,7 +177,7 @@ func (mr *mr) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mr.Percent[0]) + b = append(b, mr.percent...) return b } diff --git a/mr_IN/mr_IN.go b/mr_IN/mr_IN.go index 6230ba2a..9aac5fd8 100644 --- a/mr_IN/mr_IN.go +++ b/mr_IN/mr_IN.go @@ -177,7 +177,7 @@ func (mr *mr_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mr.Percent[0]) + b = append(b, mr.percent...) return b } diff --git a/mr_IN/mr_IN_test.go b/mr_IN/mr_IN_test.go index e9e802b9..7ac7bbb5 100644 --- a/mr_IN/mr_IN_test.go +++ b/mr_IN/mr_IN_test.go @@ -24,9 +24,4 @@ func TestGrouping(t *testing.T) { t.Errorf("Expected '%s' Got '%s", tt.expected, s) } } - - // num := float64(1123456.5643) - - // s := trans.FmtNumber(num, 2) - // fmt.Println(string(s)) } @@ -145,7 +145,7 @@ func (ms *ms) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ms.Percent[0]) + b = append(b, ms.percent...) return b } diff --git a/ms_BN/ms_BN.go b/ms_BN/ms_BN.go index aed5b3f0..1ca0f521 100644 --- a/ms_BN/ms_BN.go +++ b/ms_BN/ms_BN.go @@ -145,7 +145,7 @@ func (ms *ms_BN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ms.Percent[0]) + b = append(b, ms.percent...) return b } diff --git a/ms_MY/ms_MY.go b/ms_MY/ms_MY.go index 11e5ee62..1546d036 100644 --- a/ms_MY/ms_MY.go +++ b/ms_MY/ms_MY.go @@ -145,7 +145,7 @@ func (ms *ms_MY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ms.Percent[0]) + b = append(b, ms.percent...) return b } diff --git a/ms_SG/ms_SG.go b/ms_SG/ms_SG.go index 79e788e4..af9636be 100644 --- a/ms_SG/ms_SG.go +++ b/ms_SG/ms_SG.go @@ -145,7 +145,7 @@ func (ms *ms_SG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ms.Percent[0]) + b = append(b, ms.percent...) return b } @@ -150,7 +150,7 @@ func (mt *mt) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mt.Percent[0]) + b = append(b, mt.percent...) return b } diff --git a/mt_MT/mt_MT.go b/mt_MT/mt_MT.go index 4685d638..fb93f1eb 100644 --- a/mt_MT/mt_MT.go +++ b/mt_MT/mt_MT.go @@ -150,7 +150,7 @@ func (mt *mt_MT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, mt.Percent[0]) + b = append(b, mt.percent...) return b } @@ -142,9 +142,7 @@ func (mua *mua) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(mua.percent) - 1; j >= 0; j-- { - b = append(b, mua.percent[j]) - } + b = append(b, mua.percent...) return b } diff --git a/mua_CM/mua_CM.go b/mua_CM/mua_CM.go index e727e743..e25e4b07 100644 --- a/mua_CM/mua_CM.go +++ b/mua_CM/mua_CM.go @@ -142,9 +142,7 @@ func (mua *mua_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(mua.percent) - 1; j >= 0; j-- { - b = append(b, mua.percent[j]) - } + b = append(b, mua.percent...) return b } @@ -138,7 +138,7 @@ func (my *my) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, my.Percent[0]) + b = append(b, my.percent...) return b } diff --git a/my_MM/my_MM.go b/my_MM/my_MM.go index 2beca196..fb531d6c 100644 --- a/my_MM/my_MM.go +++ b/my_MM/my_MM.go @@ -138,7 +138,7 @@ func (my *my_MM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, my.Percent[0]) + b = append(b, my.percent...) return b } @@ -158,9 +158,9 @@ func (nb *nb) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nb.percent) - 1; j >= 0; j-- { - b = append(b, nb.percent[j]) - } + b = append(b, " "...) + + b = append(b, nb.percent...) return b } diff --git a/nb_NO/nb_NO.go b/nb_NO/nb_NO.go index a20277dc..8a24a834 100644 --- a/nb_NO/nb_NO.go +++ b/nb_NO/nb_NO.go @@ -158,9 +158,9 @@ func (nb *nb_NO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nb.percent) - 1; j >= 0; j-- { - b = append(b, nb.percent[j]) - } + b = append(b, " "...) + + b = append(b, nb.percent...) return b } diff --git a/nb_SJ/nb_SJ.go b/nb_SJ/nb_SJ.go index c7187d88..870a2ba4 100644 --- a/nb_SJ/nb_SJ.go +++ b/nb_SJ/nb_SJ.go @@ -158,9 +158,9 @@ func (nb *nb_SJ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nb.percent) - 1; j >= 0; j-- { - b = append(b, nb.percent[j]) - } + b = append(b, " "...) + + b = append(b, nb.percent...) return b } @@ -163,7 +163,7 @@ func (ne *ne) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ne.Percent[0]) + b = append(b, ne.percent...) return b } diff --git a/ne_IN/ne_IN.go b/ne_IN/ne_IN.go index d159de92..8c50c477 100644 --- a/ne_IN/ne_IN.go +++ b/ne_IN/ne_IN.go @@ -163,7 +163,7 @@ func (ne *ne_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ne.Percent[0]) + b = append(b, ne.percent...) return b } diff --git a/ne_NP/ne_NP.go b/ne_NP/ne_NP.go index 11a751f6..d840c12e 100644 --- a/ne_NP/ne_NP.go +++ b/ne_NP/ne_NP.go @@ -163,7 +163,7 @@ func (ne *ne_NP) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ne.Percent[0]) + b = append(b, ne.percent...) return b } @@ -170,9 +170,7 @@ func (nl *nl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_AW/nl_AW.go b/nl_AW/nl_AW.go index eda9ea50..2af8975e 100644 --- a/nl_AW/nl_AW.go +++ b/nl_AW/nl_AW.go @@ -170,9 +170,7 @@ func (nl *nl_AW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_BE/nl_BE.go b/nl_BE/nl_BE.go index 5341ecfe..ec30bbd8 100644 --- a/nl_BE/nl_BE.go +++ b/nl_BE/nl_BE.go @@ -170,9 +170,7 @@ func (nl *nl_BE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_BQ/nl_BQ.go b/nl_BQ/nl_BQ.go index 570ef887..6a847b96 100644 --- a/nl_BQ/nl_BQ.go +++ b/nl_BQ/nl_BQ.go @@ -170,9 +170,7 @@ func (nl *nl_BQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_CW/nl_CW.go b/nl_CW/nl_CW.go index 4f60e14e..44c28e5e 100644 --- a/nl_CW/nl_CW.go +++ b/nl_CW/nl_CW.go @@ -170,9 +170,7 @@ func (nl *nl_CW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_NL/nl_NL.go b/nl_NL/nl_NL.go index b4d08642..5aa9ba0a 100644 --- a/nl_NL/nl_NL.go +++ b/nl_NL/nl_NL.go @@ -170,9 +170,7 @@ func (nl *nl_NL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_SR/nl_SR.go b/nl_SR/nl_SR.go index f1a2b19a..93d2282f 100644 --- a/nl_SR/nl_SR.go +++ b/nl_SR/nl_SR.go @@ -170,9 +170,7 @@ func (nl *nl_SR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } diff --git a/nl_SX/nl_SX.go b/nl_SX/nl_SX.go index 14ea24f2..068aaa67 100644 --- a/nl_SX/nl_SX.go +++ b/nl_SX/nl_SX.go @@ -170,9 +170,7 @@ func (nl *nl_SX) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nl.percent) - 1; j >= 0; j-- { - b = append(b, nl.percent[j]) - } + b = append(b, nl.percent...) return b } @@ -145,9 +145,7 @@ func (nmg *nmg) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nmg.percent) - 1; j >= 0; j-- { - b = append(b, nmg.percent[j]) - } + b = append(b, nmg.percent...) return b } diff --git a/nmg_CM/nmg_CM.go b/nmg_CM/nmg_CM.go index 12d98168..ea88b813 100644 --- a/nmg_CM/nmg_CM.go +++ b/nmg_CM/nmg_CM.go @@ -145,9 +145,7 @@ func (nmg *nmg_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nmg.percent) - 1; j >= 0; j-- { - b = append(b, nmg.percent[j]) - } + b = append(b, nmg.percent...) return b } @@ -152,7 +152,9 @@ func (nn *nn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, nn.Percent[0]) + b = append(b, " "...) + + b = append(b, nn.percent...) return b } diff --git a/nn_NO/nn_NO.go b/nn_NO/nn_NO.go index e09c683a..15735d33 100644 --- a/nn_NO/nn_NO.go +++ b/nn_NO/nn_NO.go @@ -152,7 +152,9 @@ func (nn *nn_NO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, nn.Percent[0]) + b = append(b, " "...) + + b = append(b, nn.percent...) return b } @@ -142,9 +142,7 @@ func (nus *nus) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nus.percent) - 1; j >= 0; j-- { - b = append(b, nus.percent[j]) - } + b = append(b, nus.percent...) return b } diff --git a/nus_SS/nus_SS.go b/nus_SS/nus_SS.go index edfade3f..815ca1cb 100644 --- a/nus_SS/nus_SS.go +++ b/nus_SS/nus_SS.go @@ -142,9 +142,7 @@ func (nus *nus_SS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(nus.percent) - 1; j >= 0; j-- { - b = append(b, nus.percent[j]) - } + b = append(b, nus.percent...) return b } @@ -158,9 +158,7 @@ func (or *or) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(or.percent) - 1; j >= 0; j-- { - b = append(b, or.percent[j]) - } + b = append(b, or.percent...) return b } diff --git a/or_IN/or_IN.go b/or_IN/or_IN.go index b712922a..e84e78f2 100644 --- a/or_IN/or_IN.go +++ b/or_IN/or_IN.go @@ -158,9 +158,7 @@ func (or *or_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(or.percent) - 1; j >= 0; j-- { - b = append(b, or.percent[j]) - } + b = append(b, or.percent...) return b } @@ -148,7 +148,7 @@ func (os *os) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, os.Percent[0]) + b = append(b, os.percent...) return b } diff --git a/os_GE/os_GE.go b/os_GE/os_GE.go index 30d4e6fa..da1f0d0c 100644 --- a/os_GE/os_GE.go +++ b/os_GE/os_GE.go @@ -148,7 +148,7 @@ func (os *os_GE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, os.Percent[0]) + b = append(b, os.percent...) return b } diff --git a/os_RU/os_RU.go b/os_RU/os_RU.go index c1d191d1..e3142d9e 100644 --- a/os_RU/os_RU.go +++ b/os_RU/os_RU.go @@ -148,7 +148,7 @@ func (os *os_RU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, os.Percent[0]) + b = append(b, os.percent...) return b } @@ -171,9 +171,7 @@ func (pa *pa) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(pa.percent) - 1; j >= 0; j-- { - b = append(b, pa.percent[j]) - } + b = append(b, pa.percent...) return b } diff --git a/pa_Arab/pa_Arab.go b/pa_Arab/pa_Arab.go index d6f48384..0bcb76c3 100644 --- a/pa_Arab/pa_Arab.go +++ b/pa_Arab/pa_Arab.go @@ -175,9 +175,7 @@ func (pa *pa_Arab) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(pa.percent) - 1; j >= 0; j-- { - b = append(b, pa.percent[j]) - } + b = append(b, pa.percent...) return b } diff --git a/pa_Arab_PK/pa_Arab_PK.go b/pa_Arab_PK/pa_Arab_PK.go index 9e0a6464..589cf7e7 100644 --- a/pa_Arab_PK/pa_Arab_PK.go +++ b/pa_Arab_PK/pa_Arab_PK.go @@ -171,9 +171,7 @@ func (pa *pa_Arab_PK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(pa.percent) - 1; j >= 0; j-- { - b = append(b, pa.percent[j]) - } + b = append(b, pa.percent...) return b } diff --git a/pa_Guru/pa_Guru.go b/pa_Guru/pa_Guru.go index 0fc3fd6d..ffb40f6f 100644 --- a/pa_Guru/pa_Guru.go +++ b/pa_Guru/pa_Guru.go @@ -171,9 +171,7 @@ func (pa *pa_Guru) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(pa.percent) - 1; j >= 0; j-- { - b = append(b, pa.percent[j]) - } + b = append(b, pa.percent...) return b } diff --git a/pa_Guru_IN/pa_Guru_IN.go b/pa_Guru_IN/pa_Guru_IN.go index 93d32198..da4e3568 100644 --- a/pa_Guru_IN/pa_Guru_IN.go +++ b/pa_Guru_IN/pa_Guru_IN.go @@ -171,9 +171,7 @@ func (pa *pa_Guru_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(pa.percent) - 1; j >= 0; j-- { - b = append(b, pa.percent[j]) - } + b = append(b, pa.percent...) return b } @@ -54,8 +54,8 @@ func (pl *pl) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) - iMod10 := i % 10 iMod100 := i % 100 + iMod10 := i % 10 if i == 1 && v == 0 { return locales.PluralRuleOne @@ -188,7 +188,7 @@ func (pl *pl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pl.Percent[0]) + b = append(b, pl.percent...) return b } diff --git a/pl_PL/pl_PL.go b/pl_PL/pl_PL.go index 33356732..ea45339b 100644 --- a/pl_PL/pl_PL.go +++ b/pl_PL/pl_PL.go @@ -188,7 +188,7 @@ func (pl *pl_PL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pl.Percent[0]) + b = append(b, pl.percent...) return b } @@ -56,8 +56,8 @@ func (prg *prg) CardinalPluralRule(num float64, v uint64) locales.PluralRule { f := locales.F(n, v) nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) - fMod100 := f % 100 fMod10 := f % 10 + fMod100 := f % 100 if (nMod10 == 0) || (nMod100 >= 11 && nMod100 <= 19) || (v == 2 && fMod100 >= 11 && fMod100 <= 19) { return locales.PluralRuleZero @@ -155,7 +155,7 @@ func (prg *prg) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, prg.Percent[0]) + b = append(b, prg.percent...) return b } diff --git a/prg_001/prg_001.go b/prg_001/prg_001.go index 75c28ce6..2398d7f6 100644 --- a/prg_001/prg_001.go +++ b/prg_001/prg_001.go @@ -155,7 +155,7 @@ func (prg *prg_001) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, prg.Percent[0]) + b = append(b, prg.percent...) return b } @@ -156,7 +156,7 @@ func (pt *pt) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_AO/pt_AO.go b/pt_AO/pt_AO.go index 81d8a8ff..990f3894 100644 --- a/pt_AO/pt_AO.go +++ b/pt_AO/pt_AO.go @@ -156,7 +156,7 @@ func (pt *pt_AO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_BR/pt_BR.go b/pt_BR/pt_BR.go index 6b308948..173bbb6e 100644 --- a/pt_BR/pt_BR.go +++ b/pt_BR/pt_BR.go @@ -156,7 +156,7 @@ func (pt *pt_BR) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_CH/pt_CH.go b/pt_CH/pt_CH.go index 6a924dc9..64e482c0 100644 --- a/pt_CH/pt_CH.go +++ b/pt_CH/pt_CH.go @@ -156,7 +156,7 @@ func (pt *pt_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_CV/pt_CV.go b/pt_CV/pt_CV.go index 16c5f6cd..ed3dabbf 100644 --- a/pt_CV/pt_CV.go +++ b/pt_CV/pt_CV.go @@ -156,7 +156,7 @@ func (pt *pt_CV) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_GQ/pt_GQ.go b/pt_GQ/pt_GQ.go index 90adfb47..c550b184 100644 --- a/pt_GQ/pt_GQ.go +++ b/pt_GQ/pt_GQ.go @@ -156,7 +156,7 @@ func (pt *pt_GQ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_GW/pt_GW.go b/pt_GW/pt_GW.go index 3c719ea8..6d2374d3 100644 --- a/pt_GW/pt_GW.go +++ b/pt_GW/pt_GW.go @@ -156,7 +156,7 @@ func (pt *pt_GW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_LU/pt_LU.go b/pt_LU/pt_LU.go index a65db99b..5eaa8694 100644 --- a/pt_LU/pt_LU.go +++ b/pt_LU/pt_LU.go @@ -156,7 +156,7 @@ func (pt *pt_LU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_MO/pt_MO.go b/pt_MO/pt_MO.go index f87618d1..35f2fa3d 100644 --- a/pt_MO/pt_MO.go +++ b/pt_MO/pt_MO.go @@ -156,7 +156,7 @@ func (pt *pt_MO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_MZ/pt_MZ.go b/pt_MZ/pt_MZ.go index 5821e2c4..7bb43838 100644 --- a/pt_MZ/pt_MZ.go +++ b/pt_MZ/pt_MZ.go @@ -156,7 +156,7 @@ func (pt *pt_MZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_PT/pt_PT.go b/pt_PT/pt_PT.go index 3eb51bb7..cda7668f 100644 --- a/pt_PT/pt_PT.go +++ b/pt_PT/pt_PT.go @@ -159,7 +159,7 @@ func (pt *pt_PT) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_ST/pt_ST.go b/pt_ST/pt_ST.go index 5ebf8e2d..de3c39fe 100644 --- a/pt_ST/pt_ST.go +++ b/pt_ST/pt_ST.go @@ -156,7 +156,7 @@ func (pt *pt_ST) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } diff --git a/pt_TL/pt_TL.go b/pt_TL/pt_TL.go index 765a3c97..ff85a4bf 100644 --- a/pt_TL/pt_TL.go +++ b/pt_TL/pt_TL.go @@ -156,7 +156,7 @@ func (pt *pt_TL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, pt.Percent[0]) + b = append(b, pt.percent...) return b } @@ -138,7 +138,9 @@ func (qu *qu) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, qu.Percent[0]) + b = append(b, " "...) + + b = append(b, qu.percent...) return b } diff --git a/qu_BO/qu_BO.go b/qu_BO/qu_BO.go index e1d3d50c..462ad45d 100644 --- a/qu_BO/qu_BO.go +++ b/qu_BO/qu_BO.go @@ -138,7 +138,9 @@ func (qu *qu_BO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, qu.Percent[0]) + b = append(b, " "...) + + b = append(b, qu.percent...) return b } diff --git a/qu_EC/qu_EC.go b/qu_EC/qu_EC.go index 79e32a77..6a4ce5aa 100644 --- a/qu_EC/qu_EC.go +++ b/qu_EC/qu_EC.go @@ -138,7 +138,9 @@ func (qu *qu_EC) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, qu.Percent[0]) + b = append(b, " "...) + + b = append(b, qu.percent...) return b } diff --git a/qu_PE/qu_PE.go b/qu_PE/qu_PE.go index 50be5182..16dead39 100644 --- a/qu_PE/qu_PE.go +++ b/qu_PE/qu_PE.go @@ -138,7 +138,9 @@ func (qu *qu_PE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, qu.Percent[0]) + b = append(b, " "...) + + b = append(b, qu.percent...) return b } @@ -152,7 +152,9 @@ func (rm *rm) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, rm.Percent[0]) + b = append(b, " "...) + + b = append(b, rm.percent...) return b } diff --git a/rm_CH/rm_CH.go b/rm_CH/rm_CH.go index bd369b30..90d96518 100644 --- a/rm_CH/rm_CH.go +++ b/rm_CH/rm_CH.go @@ -152,7 +152,9 @@ func (rm *rm_CH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, rm.Percent[0]) + b = append(b, " "...) + + b = append(b, rm.percent...) return b } @@ -142,9 +142,9 @@ func (rn *rn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(rn.percent) - 1; j >= 0; j-- { - b = append(b, rn.percent[j]) - } + b = append(b, " "...) + + b = append(b, rn.percent...) return b } diff --git a/rn_BI/rn_BI.go b/rn_BI/rn_BI.go index eaf1e8c0..7e580fe2 100644 --- a/rn_BI/rn_BI.go +++ b/rn_BI/rn_BI.go @@ -142,9 +142,9 @@ func (rn *rn_BI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(rn.percent) - 1; j >= 0; j-- { - b = append(b, rn.percent[j]) - } + b = append(b, " "...) + + b = append(b, rn.percent...) return b } @@ -175,7 +175,9 @@ func (ro *ro) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ro.Percent[0]) + b = append(b, " "...) + + b = append(b, ro.percent...) return b } diff --git a/ro_MD/ro_MD.go b/ro_MD/ro_MD.go index 9e0a881f..a1675b78 100644 --- a/ro_MD/ro_MD.go +++ b/ro_MD/ro_MD.go @@ -175,7 +175,9 @@ func (ro *ro_MD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ro.Percent[0]) + b = append(b, " "...) + + b = append(b, ro.percent...) return b } diff --git a/ro_RO/ro_RO.go b/ro_RO/ro_RO.go index 038a9018..d7f15d2d 100644 --- a/ro_RO/ro_RO.go +++ b/ro_RO/ro_RO.go @@ -175,7 +175,9 @@ func (ro *ro_RO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ro.Percent[0]) + b = append(b, " "...) + + b = append(b, ro.percent...) return b } @@ -192,7 +192,9 @@ func (ru *ru) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } diff --git a/ru_BY/ru_BY.go b/ru_BY/ru_BY.go index 180870ec..49881d60 100644 --- a/ru_BY/ru_BY.go +++ b/ru_BY/ru_BY.go @@ -192,7 +192,9 @@ func (ru *ru_BY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } diff --git a/ru_KG/ru_KG.go b/ru_KG/ru_KG.go index 0ceacdfb..bdfb9c75 100644 --- a/ru_KG/ru_KG.go +++ b/ru_KG/ru_KG.go @@ -192,7 +192,9 @@ func (ru *ru_KG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } diff --git a/ru_KZ/ru_KZ.go b/ru_KZ/ru_KZ.go index b4305e30..ce730fbb 100644 --- a/ru_KZ/ru_KZ.go +++ b/ru_KZ/ru_KZ.go @@ -192,7 +192,9 @@ func (ru *ru_KZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } diff --git a/ru_MD/ru_MD.go b/ru_MD/ru_MD.go index 605a3ec2..6940776e 100644 --- a/ru_MD/ru_MD.go +++ b/ru_MD/ru_MD.go @@ -192,7 +192,9 @@ func (ru *ru_MD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } diff --git a/ru_RU/ru_RU.go b/ru_RU/ru_RU.go index fa5da9aa..019d9138 100644 --- a/ru_RU/ru_RU.go +++ b/ru_RU/ru_RU.go @@ -54,8 +54,8 @@ func (ru *ru_RU) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) - iMod100 := i % 100 iMod10 := i % 10 + iMod100 := i % 100 if v == 0 && iMod10 == 1 && iMod100 != 11 { return locales.PluralRuleOne @@ -192,7 +192,9 @@ func (ru *ru_RU) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } diff --git a/ru_UA/ru_UA.go b/ru_UA/ru_UA.go index 713fe1e5..2779de73 100644 --- a/ru_UA/ru_UA.go +++ b/ru_UA/ru_UA.go @@ -54,8 +54,8 @@ func (ru *ru_UA) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) - iMod10 := i % 10 iMod100 := i % 100 + iMod10 := i % 10 if v == 0 && iMod10 == 1 && iMod100 != 11 { return locales.PluralRuleOne @@ -192,7 +192,9 @@ func (ru *ru_UA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ru.Percent[0]) + b = append(b, " "...) + + b = append(b, ru.percent...) return b } @@ -142,9 +142,7 @@ func (sbp *sbp) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(sbp.percent) - 1; j >= 0; j-- { - b = append(b, sbp.percent[j]) - } + b = append(b, sbp.percent...) return b } diff --git a/sbp_TZ/sbp_TZ.go b/sbp_TZ/sbp_TZ.go index 38b8a72b..2550c4f8 100644 --- a/sbp_TZ/sbp_TZ.go +++ b/sbp_TZ/sbp_TZ.go @@ -142,9 +142,7 @@ func (sbp *sbp_TZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(sbp.percent) - 1; j >= 0; j-- { - b = append(b, sbp.percent[j]) - } + b = append(b, sbp.percent...) return b } @@ -154,7 +154,9 @@ func (se *se) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, se.Percent[0]) + b = append(b, " "...) + + b = append(b, se.percent...) return b } diff --git a/se_FI/se_FI.go b/se_FI/se_FI.go index d0df1936..bcb27208 100644 --- a/se_FI/se_FI.go +++ b/se_FI/se_FI.go @@ -154,7 +154,9 @@ func (se *se_FI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, se.Percent[0]) + b = append(b, " "...) + + b = append(b, se.percent...) return b } diff --git a/se_NO/se_NO.go b/se_NO/se_NO.go index 1e6f9597..7fc0faf8 100644 --- a/se_NO/se_NO.go +++ b/se_NO/se_NO.go @@ -154,7 +154,9 @@ func (se *se_NO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, se.Percent[0]) + b = append(b, " "...) + + b = append(b, se.percent...) return b } diff --git a/se_SE/se_SE.go b/se_SE/se_SE.go index 20f6dc50..99ab3385 100644 --- a/se_SE/se_SE.go +++ b/se_SE/se_SE.go @@ -154,7 +154,9 @@ func (se *se_SE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, se.Percent[0]) + b = append(b, " "...) + + b = append(b, se.percent...) return b } @@ -160,7 +160,7 @@ func (si *si) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, si.Percent[0]) + b = append(b, si.percent...) return b } diff --git a/si_LK/si_LK.go b/si_LK/si_LK.go index ef5de4a7..57d9e744 100644 --- a/si_LK/si_LK.go +++ b/si_LK/si_LK.go @@ -160,7 +160,7 @@ func (si *si_LK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, si.Percent[0]) + b = append(b, si.percent...) return b } @@ -186,7 +186,9 @@ func (sk *sk) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sk.Percent[0]) + b = append(b, " "...) + + b = append(b, sk.percent...) return b } diff --git a/sk_SK/sk_SK.go b/sk_SK/sk_SK.go index 12305cd8..5ef91a35 100644 --- a/sk_SK/sk_SK.go +++ b/sk_SK/sk_SK.go @@ -186,7 +186,9 @@ func (sk *sk_SK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sk.Percent[0]) + b = append(b, " "...) + + b = append(b, sk.percent...) return b } @@ -188,7 +188,7 @@ func (sl *sl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sl.Percent[0]) + b = append(b, sl.percent...) return b } diff --git a/sl_SI/sl_SI.go b/sl_SI/sl_SI.go index 4b957fa1..02e9623f 100644 --- a/sl_SI/sl_SI.go +++ b/sl_SI/sl_SI.go @@ -188,7 +188,7 @@ func (sl *sl_SI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sl.Percent[0]) + b = append(b, sl.percent...) return b } @@ -65,8 +65,8 @@ func (sq *sq) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (sq *sq) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if n == 1 { return locales.PluralRuleOne @@ -170,7 +170,7 @@ func (sq *sq) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sq.Percent[0]) + b = append(b, sq.percent...) return b } diff --git a/sq_AL/sq_AL.go b/sq_AL/sq_AL.go index a921c3eb..e0024821 100644 --- a/sq_AL/sq_AL.go +++ b/sq_AL/sq_AL.go @@ -170,7 +170,7 @@ func (sq *sq_AL) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sq.Percent[0]) + b = append(b, sq.percent...) return b } diff --git a/sq_MK/sq_MK.go b/sq_MK/sq_MK.go index cb4fe918..5ad4b285 100644 --- a/sq_MK/sq_MK.go +++ b/sq_MK/sq_MK.go @@ -65,8 +65,8 @@ func (sq *sq_MK) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (sq *sq_MK) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if n == 1 { return locales.PluralRuleOne @@ -170,7 +170,7 @@ func (sq *sq_MK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sq.Percent[0]) + b = append(b, sq.percent...) return b } diff --git a/sq_XK/sq_XK.go b/sq_XK/sq_XK.go index 95c55c31..3e9b0e5a 100644 --- a/sq_XK/sq_XK.go +++ b/sq_XK/sq_XK.go @@ -170,7 +170,7 @@ func (sq *sq_XK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sq.Percent[0]) + b = append(b, sq.percent...) return b } @@ -57,8 +57,8 @@ func (sr *sr) CardinalPluralRule(num float64, v uint64) locales.PluralRule { f := locales.F(n, v) iMod10 := i % 10 iMod100 := i % 100 - fMod100 := f % 100 fMod10 := f % 10 + fMod100 := f % 100 if (v == 0 && iMod10 == 1 && iMod100 != 11) || (fMod10 == 1 && fMod100 != 11) { return locales.PluralRuleOne @@ -176,7 +176,7 @@ func (sr *sr) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Cyrl/sr_Cyrl.go b/sr_Cyrl/sr_Cyrl.go index 2d11673c..271e3f4a 100644 --- a/sr_Cyrl/sr_Cyrl.go +++ b/sr_Cyrl/sr_Cyrl.go @@ -176,7 +176,7 @@ func (sr *sr_Cyrl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Cyrl_BA/sr_Cyrl_BA.go b/sr_Cyrl_BA/sr_Cyrl_BA.go index 23026b0f..c78a3317 100644 --- a/sr_Cyrl_BA/sr_Cyrl_BA.go +++ b/sr_Cyrl_BA/sr_Cyrl_BA.go @@ -176,7 +176,7 @@ func (sr *sr_Cyrl_BA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Cyrl_ME/sr_Cyrl_ME.go b/sr_Cyrl_ME/sr_Cyrl_ME.go index 29cdeeec..bf140c57 100644 --- a/sr_Cyrl_ME/sr_Cyrl_ME.go +++ b/sr_Cyrl_ME/sr_Cyrl_ME.go @@ -57,8 +57,8 @@ func (sr *sr_Cyrl_ME) CardinalPluralRule(num float64, v uint64) locales.PluralRu f := locales.F(n, v) iMod10 := i % 10 iMod100 := i % 100 - fMod100 := f % 100 fMod10 := f % 10 + fMod100 := f % 100 if (v == 0 && iMod10 == 1 && iMod100 != 11) || (fMod10 == 1 && fMod100 != 11) { return locales.PluralRuleOne @@ -176,7 +176,7 @@ func (sr *sr_Cyrl_ME) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Cyrl_RS/sr_Cyrl_RS.go b/sr_Cyrl_RS/sr_Cyrl_RS.go index 14ef556d..98c04ee8 100644 --- a/sr_Cyrl_RS/sr_Cyrl_RS.go +++ b/sr_Cyrl_RS/sr_Cyrl_RS.go @@ -176,7 +176,7 @@ func (sr *sr_Cyrl_RS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Cyrl_XK/sr_Cyrl_XK.go b/sr_Cyrl_XK/sr_Cyrl_XK.go index ee80ee53..aeed8536 100644 --- a/sr_Cyrl_XK/sr_Cyrl_XK.go +++ b/sr_Cyrl_XK/sr_Cyrl_XK.go @@ -176,7 +176,7 @@ func (sr *sr_Cyrl_XK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Latn/sr_Latn.go b/sr_Latn/sr_Latn.go index cde8e9e0..3505445b 100644 --- a/sr_Latn/sr_Latn.go +++ b/sr_Latn/sr_Latn.go @@ -176,7 +176,7 @@ func (sr *sr_Latn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Latn_BA/sr_Latn_BA.go b/sr_Latn_BA/sr_Latn_BA.go index 9dc0df88..b5879746 100644 --- a/sr_Latn_BA/sr_Latn_BA.go +++ b/sr_Latn_BA/sr_Latn_BA.go @@ -57,8 +57,8 @@ func (sr *sr_Latn_BA) CardinalPluralRule(num float64, v uint64) locales.PluralRu f := locales.F(n, v) iMod10 := i % 10 iMod100 := i % 100 - fMod10 := f % 10 fMod100 := f % 100 + fMod10 := f % 10 if (v == 0 && iMod10 == 1 && iMod100 != 11) || (fMod10 == 1 && fMod100 != 11) { return locales.PluralRuleOne @@ -176,7 +176,7 @@ func (sr *sr_Latn_BA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Latn_ME/sr_Latn_ME.go b/sr_Latn_ME/sr_Latn_ME.go index be22be96..1130fb85 100644 --- a/sr_Latn_ME/sr_Latn_ME.go +++ b/sr_Latn_ME/sr_Latn_ME.go @@ -55,8 +55,8 @@ func (sr *sr_Latn_ME) CardinalPluralRule(num float64, v uint64) locales.PluralRu n := math.Abs(num) i := int64(n) f := locales.F(n, v) - iMod100 := i % 100 iMod10 := i % 10 + iMod100 := i % 100 fMod10 := f % 10 fMod100 := f % 100 @@ -176,7 +176,7 @@ func (sr *sr_Latn_ME) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Latn_RS/sr_Latn_RS.go b/sr_Latn_RS/sr_Latn_RS.go index f5dac59f..9dd78978 100644 --- a/sr_Latn_RS/sr_Latn_RS.go +++ b/sr_Latn_RS/sr_Latn_RS.go @@ -176,7 +176,7 @@ func (sr *sr_Latn_RS) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } diff --git a/sr_Latn_XK/sr_Latn_XK.go b/sr_Latn_XK/sr_Latn_XK.go index 892b801d..9fc43c93 100644 --- a/sr_Latn_XK/sr_Latn_XK.go +++ b/sr_Latn_XK/sr_Latn_XK.go @@ -55,8 +55,8 @@ func (sr *sr_Latn_XK) CardinalPluralRule(num float64, v uint64) locales.PluralRu n := math.Abs(num) i := int64(n) f := locales.F(n, v) - iMod10 := i % 10 iMod100 := i % 100 + iMod10 := i % 10 fMod10 := f % 10 fMod100 := f % 100 @@ -176,7 +176,7 @@ func (sr *sr_Latn_XK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sr.Percent[0]) + b = append(b, sr.percent...) return b } @@ -168,9 +168,9 @@ func (sv *sv) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(sv.percent) - 1; j >= 0; j-- { - b = append(b, sv.percent[j]) - } + b = append(b, " "...) + + b = append(b, sv.percent...) return b } diff --git a/sv_AX/sv_AX.go b/sv_AX/sv_AX.go index 2919cab3..59eb3bcd 100644 --- a/sv_AX/sv_AX.go +++ b/sv_AX/sv_AX.go @@ -66,8 +66,8 @@ func (sv *sv_AX) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (sv *sv_AX) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod100 := math.Mod(n, 100) nMod10 := math.Mod(n, 10) + nMod100 := math.Mod(n, 100) if (nMod10 == 1 || nMod10 == 2) && (nMod100 != 11 && nMod100 != 12) { return locales.PluralRuleOne @@ -168,9 +168,9 @@ func (sv *sv_AX) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(sv.percent) - 1; j >= 0; j-- { - b = append(b, sv.percent[j]) - } + b = append(b, " "...) + + b = append(b, sv.percent...) return b } diff --git a/sv_FI/sv_FI.go b/sv_FI/sv_FI.go index 46a80607..0a9384d2 100644 --- a/sv_FI/sv_FI.go +++ b/sv_FI/sv_FI.go @@ -168,9 +168,9 @@ func (sv *sv_FI) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(sv.percent) - 1; j >= 0; j-- { - b = append(b, sv.percent[j]) - } + b = append(b, " "...) + + b = append(b, sv.percent...) return b } diff --git a/sv_SE/sv_SE.go b/sv_SE/sv_SE.go index f61e7c11..07712452 100644 --- a/sv_SE/sv_SE.go +++ b/sv_SE/sv_SE.go @@ -168,9 +168,9 @@ func (sv *sv_SE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(sv.percent) - 1; j >= 0; j-- { - b = append(b, sv.percent[j]) - } + b = append(b, " "...) + + b = append(b, sv.percent...) return b } @@ -157,7 +157,7 @@ func (sw *sw) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sw.Percent[0]) + b = append(b, sw.percent...) return b } diff --git a/sw_CD/sw_CD.go b/sw_CD/sw_CD.go index 1bf39b14..1d4883eb 100644 --- a/sw_CD/sw_CD.go +++ b/sw_CD/sw_CD.go @@ -157,7 +157,7 @@ func (sw *sw_CD) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sw.Percent[0]) + b = append(b, sw.percent...) return b } diff --git a/sw_KE/sw_KE.go b/sw_KE/sw_KE.go index 2f570270..71d1bc86 100644 --- a/sw_KE/sw_KE.go +++ b/sw_KE/sw_KE.go @@ -157,7 +157,7 @@ func (sw *sw_KE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sw.Percent[0]) + b = append(b, sw.percent...) return b } diff --git a/sw_TZ/sw_TZ.go b/sw_TZ/sw_TZ.go index 2b431d28..a454d718 100644 --- a/sw_TZ/sw_TZ.go +++ b/sw_TZ/sw_TZ.go @@ -157,7 +157,7 @@ func (sw *sw_TZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sw.Percent[0]) + b = append(b, sw.percent...) return b } diff --git a/sw_UG/sw_UG.go b/sw_UG/sw_UG.go index d98e75a0..3450c3e7 100644 --- a/sw_UG/sw_UG.go +++ b/sw_UG/sw_UG.go @@ -157,7 +157,7 @@ func (sw *sw_UG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, sw.Percent[0]) + b = append(b, sw.percent...) return b } @@ -165,7 +165,7 @@ func (ta *ta) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ta.Percent[0]) + b = append(b, ta.percent...) return b } diff --git a/ta_IN/ta_IN.go b/ta_IN/ta_IN.go index 20f0066f..2c1d1275 100644 --- a/ta_IN/ta_IN.go +++ b/ta_IN/ta_IN.go @@ -165,7 +165,7 @@ func (ta *ta_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ta.Percent[0]) + b = append(b, ta.percent...) return b } diff --git a/ta_LK/ta_LK.go b/ta_LK/ta_LK.go index df628d89..f3a4abec 100644 --- a/ta_LK/ta_LK.go +++ b/ta_LK/ta_LK.go @@ -165,7 +165,7 @@ func (ta *ta_LK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ta.Percent[0]) + b = append(b, ta.percent...) return b } diff --git a/ta_MY/ta_MY.go b/ta_MY/ta_MY.go index b30df2fd..a0a95cf8 100644 --- a/ta_MY/ta_MY.go +++ b/ta_MY/ta_MY.go @@ -156,7 +156,7 @@ func (ta *ta_MY) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ta.Percent[0]) + b = append(b, ta.percent...) return b } diff --git a/ta_SG/ta_SG.go b/ta_SG/ta_SG.go index f73a15a0..b400680c 100644 --- a/ta_SG/ta_SG.go +++ b/ta_SG/ta_SG.go @@ -156,7 +156,7 @@ func (ta *ta_SG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ta.Percent[0]) + b = append(b, ta.percent...) return b } @@ -165,7 +165,7 @@ func (te *te) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, te.Percent[0]) + b = append(b, te.percent...) return b } diff --git a/te_IN/te_IN.go b/te_IN/te_IN.go index d9b80094..4872ef64 100644 --- a/te_IN/te_IN.go +++ b/te_IN/te_IN.go @@ -165,7 +165,7 @@ func (te *te_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, te.Percent[0]) + b = append(b, te.percent...) return b } @@ -138,7 +138,7 @@ func (th *th) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, th.Percent[0]) + b = append(b, th.percent...) return b } diff --git a/th_TH/th_TH.go b/th_TH/th_TH.go index 0df38fe3..6325b611 100644 --- a/th_TH/th_TH.go +++ b/th_TH/th_TH.go @@ -138,7 +138,7 @@ func (th *th_TH) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, th.Percent[0]) + b = append(b, th.percent...) return b } @@ -148,7 +148,9 @@ func (tk *tk) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, tk.Percent[0]) + b = append(b, " "...) + + b = append(b, tk.percent...) return b } diff --git a/tk_TM/tk_TM.go b/tk_TM/tk_TM.go index 60c587de..5cc99943 100644 --- a/tk_TM/tk_TM.go +++ b/tk_TM/tk_TM.go @@ -148,7 +148,9 @@ func (tk *tk_TM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, tk.Percent[0]) + b = append(b, " "...) + + b = append(b, tk.percent...) return b } @@ -138,7 +138,7 @@ func (to *to) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, to.Percent[0]) + b = append(b, to.percent...) return b } diff --git a/to_TO/to_TO.go b/to_TO/to_TO.go index 40b15459..2705cad1 100644 --- a/to_TO/to_TO.go +++ b/to_TO/to_TO.go @@ -138,7 +138,7 @@ func (to *to_TO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, to.Percent[0]) + b = append(b, to.percent...) return b } @@ -133,17 +133,29 @@ func (tr *tr) FmtNumber(num float64, v uint64) []byte { func (tr *tr) FmtPercent(num float64, v uint64) []byte { s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) - l := len(s) + len(tr.decimal) - + l := len(s) + len(tr.decimal) + len(tr.group)*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] == '.' { b = append(b, tr.decimal[0]) + inWhole = true + continue } + if inWhole { + if count == 3 { + b = append(b, tr.group[0]) + count = 1 + } else { + count++ + } + } + b = append(b, s[i]) } @@ -151,7 +163,7 @@ func (tr *tr) FmtPercent(num float64, v uint64) []byte { b = append(b, tr.minus[0]) } - b = append(b, tr.Percent[0]) + b = append(b, tr.percent[0]) // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { diff --git a/tr_CY/tr_CY.go b/tr_CY/tr_CY.go index 44598b8e..5c991816 100644 --- a/tr_CY/tr_CY.go +++ b/tr_CY/tr_CY.go @@ -133,17 +133,29 @@ func (tr *tr_CY) FmtNumber(num float64, v uint64) []byte { func (tr *tr_CY) FmtPercent(num float64, v uint64) []byte { s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) - l := len(s) + len(tr.decimal) - + l := len(s) + len(tr.decimal) + len(tr.group)*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] == '.' { b = append(b, tr.decimal[0]) + inWhole = true + continue } + if inWhole { + if count == 3 { + b = append(b, tr.group[0]) + count = 1 + } else { + count++ + } + } + b = append(b, s[i]) } @@ -151,7 +163,7 @@ func (tr *tr_CY) FmtPercent(num float64, v uint64) []byte { b = append(b, tr.minus[0]) } - b = append(b, tr.Percent[0]) + b = append(b, tr.percent[0]) // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { diff --git a/tr_TR/tr_TR.go b/tr_TR/tr_TR.go index 2f69d8ab..f174fcfb 100644 --- a/tr_TR/tr_TR.go +++ b/tr_TR/tr_TR.go @@ -133,17 +133,29 @@ func (tr *tr_TR) FmtNumber(num float64, v uint64) []byte { func (tr *tr_TR) FmtPercent(num float64, v uint64) []byte { s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) - l := len(s) + len(tr.decimal) - + l := len(s) + len(tr.decimal) + len(tr.group)*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] == '.' { b = append(b, tr.decimal[0]) + inWhole = true + continue } + if inWhole { + if count == 3 { + b = append(b, tr.group[0]) + count = 1 + } else { + count++ + } + } + b = append(b, s[i]) } @@ -151,7 +163,7 @@ func (tr *tr_TR) FmtPercent(num float64, v uint64) []byte { b = append(b, tr.minus[0]) } - b = append(b, tr.Percent[0]) + b = append(b, tr.percent[0]) // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { @@ -145,9 +145,7 @@ func (twq *twq) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(twq.percent) - 1; j >= 0; j-- { - b = append(b, twq.percent[j]) - } + b = append(b, twq.percent...) return b } diff --git a/twq_NE/twq_NE.go b/twq_NE/twq_NE.go index ea93f303..2ba16956 100644 --- a/twq_NE/twq_NE.go +++ b/twq_NE/twq_NE.go @@ -145,9 +145,7 @@ func (twq *twq_NE) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(twq.percent) - 1; j >= 0; j-- { - b = append(b, twq.percent[j]) - } + b = append(b, twq.percent...) return b } @@ -156,7 +156,7 @@ func (ug *ug) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ug.Percent[0]) + b = append(b, ug.percent...) return b } diff --git a/ug_CN/ug_CN.go b/ug_CN/ug_CN.go index b6b63106..ed471231 100644 --- a/ug_CN/ug_CN.go +++ b/ug_CN/ug_CN.go @@ -156,7 +156,7 @@ func (ug *ug_CN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ug.Percent[0]) + b = append(b, ug.percent...) return b } @@ -201,7 +201,7 @@ func (uk *uk) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, uk.Percent[0]) + b = append(b, uk.percent...) return b } diff --git a/uk_UA/uk_UA.go b/uk_UA/uk_UA.go index b01430bf..d9b47f60 100644 --- a/uk_UA/uk_UA.go +++ b/uk_UA/uk_UA.go @@ -72,8 +72,8 @@ func (uk *uk_UA) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (uk *uk_UA) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 3 && nMod100 != 13 { return locales.PluralRuleFew @@ -201,7 +201,7 @@ func (uk *uk_UA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, uk.Percent[0]) + b = append(b, uk.percent...) return b } @@ -150,7 +150,7 @@ func (ur *ur) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ur.Percent[0]) + b = append(b, ur.percent...) return b } diff --git a/ur_IN/ur_IN.go b/ur_IN/ur_IN.go index 36acc3f8..21880d76 100644 --- a/ur_IN/ur_IN.go +++ b/ur_IN/ur_IN.go @@ -150,7 +150,7 @@ func (ur *ur_IN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ur.Percent[0]) + b = append(b, ur.percent...) return b } diff --git a/ur_PK/ur_PK.go b/ur_PK/ur_PK.go index bbee2174..9818318e 100644 --- a/ur_PK/ur_PK.go +++ b/ur_PK/ur_PK.go @@ -150,7 +150,7 @@ func (ur *ur_PK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, ur.Percent[0]) + b = append(b, ur.percent...) return b } @@ -165,9 +165,7 @@ func (uz *uz) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } diff --git a/uz_Arab/uz_Arab.go b/uz_Arab/uz_Arab.go index f8c717bb..70fdfb6a 100644 --- a/uz_Arab/uz_Arab.go +++ b/uz_Arab/uz_Arab.go @@ -165,9 +165,7 @@ func (uz *uz_Arab) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } diff --git a/uz_Arab_AF/uz_Arab_AF.go b/uz_Arab_AF/uz_Arab_AF.go index fac44429..7a7cbdc6 100644 --- a/uz_Arab_AF/uz_Arab_AF.go +++ b/uz_Arab_AF/uz_Arab_AF.go @@ -165,9 +165,7 @@ func (uz *uz_Arab_AF) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } diff --git a/uz_Cyrl/uz_Cyrl.go b/uz_Cyrl/uz_Cyrl.go index 655c87c2..901af809 100644 --- a/uz_Cyrl/uz_Cyrl.go +++ b/uz_Cyrl/uz_Cyrl.go @@ -165,9 +165,7 @@ func (uz *uz_Cyrl) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } diff --git a/uz_Cyrl_UZ/uz_Cyrl_UZ.go b/uz_Cyrl_UZ/uz_Cyrl_UZ.go index 66d0bad9..e2d95aa3 100644 --- a/uz_Cyrl_UZ/uz_Cyrl_UZ.go +++ b/uz_Cyrl_UZ/uz_Cyrl_UZ.go @@ -165,9 +165,7 @@ func (uz *uz_Cyrl_UZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } diff --git a/uz_Latn/uz_Latn.go b/uz_Latn/uz_Latn.go index 4fed3780..60e3a3d1 100644 --- a/uz_Latn/uz_Latn.go +++ b/uz_Latn/uz_Latn.go @@ -165,9 +165,7 @@ func (uz *uz_Latn) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } diff --git a/uz_Latn_UZ/uz_Latn_UZ.go b/uz_Latn_UZ/uz_Latn_UZ.go index ee4042c7..d48d2ea1 100644 --- a/uz_Latn_UZ/uz_Latn_UZ.go +++ b/uz_Latn_UZ/uz_Latn_UZ.go @@ -165,9 +165,7 @@ func (uz *uz_Latn_UZ) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(uz.percent) - 1; j >= 0; j-- { - b = append(b, uz.percent[j]) - } + b = append(b, uz.percent...) return b } @@ -145,7 +145,7 @@ func (vi *vi) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, vi.Percent[0]) + b = append(b, vi.percent...) return b } diff --git a/vi_VN/vi_VN.go b/vi_VN/vi_VN.go index 1ab40d35..aa3eed8f 100644 --- a/vi_VN/vi_VN.go +++ b/vi_VN/vi_VN.go @@ -145,7 +145,7 @@ func (vi *vi_VN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, vi.Percent[0]) + b = append(b, vi.percent...) return b } @@ -145,9 +145,7 @@ func (yav *yav) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(yav.percent) - 1; j >= 0; j-- { - b = append(b, yav.percent[j]) - } + b = append(b, yav.percent...) return b } diff --git a/yav_CM/yav_CM.go b/yav_CM/yav_CM.go index 5a7a9e2d..30876887 100644 --- a/yav_CM/yav_CM.go +++ b/yav_CM/yav_CM.go @@ -145,9 +145,7 @@ func (yav *yav_CM) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(yav.percent) - 1; j >= 0; j-- { - b = append(b, yav.percent[j]) - } + b = append(b, yav.percent...) return b } @@ -138,7 +138,7 @@ func (yue *yue) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, yue.Percent[0]) + b = append(b, yue.percent...) return b } diff --git a/yue_HK/yue_HK.go b/yue_HK/yue_HK.go index 18cdbb24..238fde99 100644 --- a/yue_HK/yue_HK.go +++ b/yue_HK/yue_HK.go @@ -138,7 +138,7 @@ func (yue *yue_HK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, yue.Percent[0]) + b = append(b, yue.percent...) return b } @@ -105,9 +105,9 @@ func (zgh *zgh) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(zgh.percent) - 1; j >= 0; j-- { - b = append(b, zgh.percent[j]) - } + b = append(b, " "...) + + b = append(b, zgh.percent...) return b } diff --git a/zgh_MA/zgh_MA.go b/zgh_MA/zgh_MA.go index f6ce4024..dc8b5739 100644 --- a/zgh_MA/zgh_MA.go +++ b/zgh_MA/zgh_MA.go @@ -105,9 +105,9 @@ func (zgh *zgh_MA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - for j := len(zgh.percent) - 1; j >= 0; j-- { - b = append(b, zgh.percent[j]) - } + b = append(b, " "...) + + b = append(b, zgh.percent...) return b } @@ -138,7 +138,7 @@ func (zh *zh) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hans/zh_Hans.go b/zh_Hans/zh_Hans.go index 56b79a59..1714897c 100644 --- a/zh_Hans/zh_Hans.go +++ b/zh_Hans/zh_Hans.go @@ -138,7 +138,7 @@ func (zh *zh_Hans) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hans_CN/zh_Hans_CN.go b/zh_Hans_CN/zh_Hans_CN.go index 98e236e4..dd02bb0f 100644 --- a/zh_Hans_CN/zh_Hans_CN.go +++ b/zh_Hans_CN/zh_Hans_CN.go @@ -138,7 +138,7 @@ func (zh *zh_Hans_CN) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hans_HK/zh_Hans_HK.go b/zh_Hans_HK/zh_Hans_HK.go index b672a082..781b2c53 100644 --- a/zh_Hans_HK/zh_Hans_HK.go +++ b/zh_Hans_HK/zh_Hans_HK.go @@ -138,7 +138,7 @@ func (zh *zh_Hans_HK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hans_MO/zh_Hans_MO.go b/zh_Hans_MO/zh_Hans_MO.go index a769c9d2..8a21b4e1 100644 --- a/zh_Hans_MO/zh_Hans_MO.go +++ b/zh_Hans_MO/zh_Hans_MO.go @@ -138,7 +138,7 @@ func (zh *zh_Hans_MO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hans_SG/zh_Hans_SG.go b/zh_Hans_SG/zh_Hans_SG.go index bb2db6bf..4bb925ef 100644 --- a/zh_Hans_SG/zh_Hans_SG.go +++ b/zh_Hans_SG/zh_Hans_SG.go @@ -138,7 +138,7 @@ func (zh *zh_Hans_SG) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hant/zh_Hant.go b/zh_Hant/zh_Hant.go index a7ae825c..d842d40f 100644 --- a/zh_Hant/zh_Hant.go +++ b/zh_Hant/zh_Hant.go @@ -138,7 +138,7 @@ func (zh *zh_Hant) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hant_HK/zh_Hant_HK.go b/zh_Hant_HK/zh_Hant_HK.go index 4a267f6f..25c811dd 100644 --- a/zh_Hant_HK/zh_Hant_HK.go +++ b/zh_Hant_HK/zh_Hant_HK.go @@ -138,7 +138,7 @@ func (zh *zh_Hant_HK) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hant_MO/zh_Hant_MO.go b/zh_Hant_MO/zh_Hant_MO.go index 7d3848c4..54430b34 100644 --- a/zh_Hant_MO/zh_Hant_MO.go +++ b/zh_Hant_MO/zh_Hant_MO.go @@ -138,7 +138,7 @@ func (zh *zh_Hant_MO) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } diff --git a/zh_Hant_TW/zh_Hant_TW.go b/zh_Hant_TW/zh_Hant_TW.go index c946ae72..418b11d1 100644 --- a/zh_Hant_TW/zh_Hant_TW.go +++ b/zh_Hant_TW/zh_Hant_TW.go @@ -138,7 +138,7 @@ func (zh *zh_Hant_TW) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zh.Percent[0]) + b = append(b, zh.percent...) return b } @@ -157,7 +157,7 @@ func (zu *zu) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zu.Percent[0]) + b = append(b, zu.percent...) return b } diff --git a/zu_ZA/zu_ZA.go b/zu_ZA/zu_ZA.go index d8d5a4cd..73f89c61 100644 --- a/zu_ZA/zu_ZA.go +++ b/zu_ZA/zu_ZA.go @@ -157,7 +157,7 @@ func (zu *zu_ZA) FmtPercent(num float64, v uint64) []byte { b[i], b[j] = b[j], b[i] } - b = append(b, zu.Percent[0]) + b = append(b, zu.percent...) return b } |