diff options
Diffstat (limited to 'fr_CI/fr_CI.go')
| -rw-r--r-- | fr_CI/fr_CI.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fr_CI/fr_CI.go b/fr_CI/fr_CI.go index 6434410e..e396001b 100644 --- a/fr_CI/fr_CI.go +++ b/fr_CI/fr_CI.go @@ -95,19 +95,15 @@ func (fr *fr_CI) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint6 // avoid allocations; otherwise just cast as string. func (fr *fr_CI) 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(fr.decimal) + len(fr.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(fr.decimal) - 1; j >= 0; j-- { b = append(b, fr.decimal[j]) } @@ -118,9 +114,7 @@ func (fr *fr_CI) FmtNumber(num float64, v uint64) []byte { } if inWhole { - if count == 3 { - for j := len(fr.group) - 1; j >= 0; j-- { b = append(b, fr.group[j]) } @@ -134,11 +128,16 @@ func (fr *fr_CI) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + for j := len(fr.minus) - 1; j >= 0; j-- { + b = append(b, fr.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 - } |