diff options
Diffstat (limited to 'bs_Cyrl/bs_Cyrl.go')
-rw-r--r-- | bs_Cyrl/bs_Cyrl.go | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/bs_Cyrl/bs_Cyrl.go b/bs_Cyrl/bs_Cyrl.go index cb76a085..7169423a 100644 --- a/bs_Cyrl/bs_Cyrl.go +++ b/bs_Cyrl/bs_Cyrl.go @@ -57,8 +57,8 @@ func (bs *bs_Cyrl) 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 @@ -107,36 +107,24 @@ func (bs *bs_Cyrl) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uin // avoid allocations; otherwise just cast as string. func (bs *bs_Cyrl) 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(bs.decimal) + len(bs.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(bs.decimal) - 1; j >= 0; j-- { - b = append(b, bs.decimal[j]) - } - + b = append(b, bs.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - - for j := len(bs.group) - 1; j >= 0; j-- { - b = append(b, bs.group[j]) - } - + b = append(b, bs.group[0]) count = 1 } else { count++ @@ -146,11 +134,14 @@ func (bs *bs_Cyrl) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, bs.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 - } |