diff options
author | joeybloggs <Dean.Karn@gmail.com> | 2016-08-13 05:03:24 +0300 |
---|---|---|
committer | joeybloggs <Dean.Karn@gmail.com> | 2016-08-13 05:03:24 +0300 |
commit | 99657750cc781e41c9c1e3be6b6316c18fc430bd (patch) | |
tree | 3366a7d2a645600dbe8efbadc86874f94c1cedb5 /hr_HR | |
parent | 7639a439740dfc3cdda4ae188bf3baf7cc2ff7a3 (diff) |
ad variable grouping logic + cleanup generated code newlines
Diffstat (limited to 'hr_HR')
-rw-r--r-- | hr_HR/hr_HR.go | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/hr_HR/hr_HR.go b/hr_HR/hr_HR.go index 23e75d5d..a2f8d8bc 100644 --- a/hr_HR/hr_HR.go +++ b/hr_HR/hr_HR.go @@ -55,8 +55,8 @@ func (hr *hr_HR) CardinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) i := int64(n) f := locales.F(n, v) - iMod100 := i % 100 iMod10 := i % 10 + iMod100 := i % 100 fMod10 := f % 10 fMod100 := f % 100 @@ -107,36 +107,24 @@ func (hr *hr_HR) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint6 // avoid allocations; otherwise just cast as string. func (hr *hr_HR) 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(hr.decimal) + len(hr.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(hr.decimal) - 1; j >= 0; j-- { - b = append(b, hr.decimal[j]) - } - + b = append(b, hr.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - - for j := len(hr.group) - 1; j >= 0; j-- { - b = append(b, hr.group[j]) - } - + b = append(b, hr.group[0]) count = 1 } else { count++ @@ -146,11 +134,14 @@ func (hr *hr_HR) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, hr.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 - } |