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 /en_US_POSIX | |
parent | 7639a439740dfc3cdda4ae188bf3baf7cc2ff7a3 (diff) |
ad variable grouping logic + cleanup generated code newlines
Diffstat (limited to 'en_US_POSIX')
-rw-r--r-- | en_US_POSIX/en_US_POSIX.go | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/en_US_POSIX/en_US_POSIX.go b/en_US_POSIX/en_US_POSIX.go index 5732b0d9..266fe518 100644 --- a/en_US_POSIX/en_US_POSIX.go +++ b/en_US_POSIX/en_US_POSIX.go @@ -66,8 +66,8 @@ func (en *en_US_POSIX) CardinalPluralRule(num float64, v uint64) locales.PluralR func (en *en_US_POSIX) OrdinalPluralRule(num float64, v uint64) locales.PluralRule { n := math.Abs(num) - nMod10 := math.Mod(n, 10) nMod100 := math.Mod(n, 100) + nMod10 := math.Mod(n, 10) if nMod10 == 1 && nMod100 != 11 { return locales.PluralRuleOne @@ -90,8 +90,7 @@ func (en *en_US_POSIX) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 // avoid allocations; otherwise just cast as string. func (en *en_US_POSIX) 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(en.decimal) b := make([]byte, 0, l) @@ -99,22 +98,21 @@ func (en *en_US_POSIX) FmtNumber(num float64, v uint64) []byte { for i := len(s) - 1; i >= 0; i-- { if s[i] == '.' { - - for j := len(en.decimal) - 1; j >= 0; j-- { - b = append(b, en.decimal[j]) - } - + b = append(b, en.decimal[0]) continue } b = append(b, s[i]) } + if num < 0 { + b = append(b, en.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 - } |