diff options
Diffstat (limited to 'ksf_CM')
-rw-r--r-- | ksf_CM/ksf_CM.go | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/ksf_CM/ksf_CM.go b/ksf_CM/ksf_CM.go index 03a436c2..e547cf5d 100644 --- a/ksf_CM/ksf_CM.go +++ b/ksf_CM/ksf_CM.go @@ -1,6 +1,7 @@ package ksf_CM import ( + "math" "strconv" "github.com/go-playground/locales" @@ -68,32 +69,23 @@ func (ksf *ksf_CM) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uin // avoid allocations; otherwise just cast as string. func (ksf *ksf_CM) 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(ksf.decimal) + len(ksf.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(ksf.decimal) - 1; j >= 0; j-- { - b = append(b, ksf.decimal[j]) - } - + b = append(b, ksf.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - for j := len(ksf.group) - 1; j >= 0; j-- { b = append(b, ksf.group[j]) } @@ -107,11 +99,16 @@ func (ksf *ksf_CM) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + for j := len(ksf.minus) - 1; j >= 0; j-- { + b = append(b, ksf.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 - } |