From 99657750cc781e41c9c1e3be6b6316c18fc430bd Mon Sep 17 00:00:00 2001 From: joeybloggs Date: Fri, 12 Aug 2016 22:03:24 -0400 Subject: ad variable grouping logic + cleanup generated code newlines --- sbp_TZ/sbp_TZ.go | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'sbp_TZ') diff --git a/sbp_TZ/sbp_TZ.go b/sbp_TZ/sbp_TZ.go index 8f8b5375..0a5c70c9 100644 --- a/sbp_TZ/sbp_TZ.go +++ b/sbp_TZ/sbp_TZ.go @@ -1,6 +1,7 @@ package sbp_TZ import ( + "math" "strconv" "github.com/go-playground/locales" @@ -68,36 +69,24 @@ func (sbp *sbp_TZ) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uin // avoid allocations; otherwise just cast as string. func (sbp *sbp_TZ) FmtNumber(num float64, v uint64) []byte { - s := strconv.FormatFloat(num, 'f', int(v), 64) - + s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) l := len(s) + len(sbp.decimal) + len(sbp.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] == '.' { - - for j := len(sbp.decimal) - 1; j >= 0; j-- { - b = append(b, sbp.decimal[j]) - } - + b = append(b, sbp.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - - for j := len(sbp.group) - 1; j >= 0; j-- { - b = append(b, sbp.group[j]) - } - + b = append(b, sbp.group[0]) count = 1 } else { count++ @@ -107,11 +96,16 @@ func (sbp *sbp_TZ) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + for j := len(sbp.minus) - 1; j >= 0; j-- { + b = append(b, sbp.minus[j]) + } + } + // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { b[i], b[j] = b[j], b[i] } return b - } -- cgit v1.2.3