diff options
Diffstat (limited to 'ru_UA/ru_UA.go')
| -rw-r--r-- | ru_UA/ru_UA.go | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ru_UA/ru_UA.go b/ru_UA/ru_UA.go index 10aafeeb..35c6decb 100644 --- a/ru_UA/ru_UA.go +++ b/ru_UA/ru_UA.go @@ -54,8 +54,8 @@ func (ru *ru_UA) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) - iMod100 := i % 100 iMod10 := i % 10 + iMod100 := i % 100 if v == 0 && iMod10 == 1 && iMod100 != 11 { return locales.PluralRuleOne @@ -120,32 +120,23 @@ func (ru *ru_UA) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint6 // avoid allocations; otherwise just cast as string. func (ru *ru_UA) 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(ru.decimal) + len(ru.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(ru.decimal) - 1; j >= 0; j-- { - b = append(b, ru.decimal[j]) - } - + b = append(b, ru.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - for j := len(ru.group) - 1; j >= 0; j-- { b = append(b, ru.group[j]) } @@ -159,11 +150,14 @@ func (ru *ru_UA) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, ru.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 - } |