diff options
Diffstat (limited to 'sq_AL/sq_AL.go')
| -rw-r--r-- | sq_AL/sq_AL.go | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sq_AL/sq_AL.go b/sq_AL/sq_AL.go index 80dc3b22..23c0054e 100644 --- a/sq_AL/sq_AL.go +++ b/sq_AL/sq_AL.go @@ -65,8 +65,8 @@ func (sq *sq_AL) CardinalPluralRule(num float64, v uint64) locales.PluralRule { func (sq *sq_AL) 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 @@ -98,32 +98,23 @@ func (sq *sq_AL) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint6 // avoid allocations; otherwise just cast as string. func (sq *sq_AL) 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(sq.decimal) + len(sq.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(sq.decimal) - 1; j >= 0; j-- { - b = append(b, sq.decimal[j]) - } - + b = append(b, sq.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - for j := len(sq.group) - 1; j >= 0; j-- { b = append(b, sq.group[j]) } @@ -137,11 +128,14 @@ func (sq *sq_AL) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, sq.minus[0]) + } + // 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 - } |