tpl: Fix bad rounding in NumFmt

strconv.FormatFloat doesn't round properly sometimes, this adds a
different method of rounding, fixes #7116

diff --git a/tpl/lang/lang.go b/tpl/lang/lang.go
index 9a9f467bbc399078378ea603fded2540eabde582..491e2492e001dce04e0d8e3f1d3ba684992bc97f 100644 (file)
--- a/tpl/lang/lang.go
+++ b/tpl/lang/lang.go
@@ -102,10 +102,13 @@ func (ns *Namespace) NumFmt(precision, number interface{}, options ...interface{
                }
        }
 
+       exp := math.Pow(10.0, float64(prec))
+       r := math.Round(n*exp) / exp
+
        // Logic from MIT Licensed github.com/go-playground/locales/
        // Original Copyright (c) 2016 Go Playground
 
-       s := strconv.FormatFloat(math.Abs(n), 'f', prec, 64)
+       s := strconv.FormatFloat(math.Abs(r), 'f', prec, 64)
        L := len(s) + 2 + len(s[:len(s)-1-prec])/3
 
        var count int

diff --git a/tpl/lang/lang_test.go b/tpl/lang/lang_test.go
index e62faf2ac98ab6ebb6c8cb85f5a423217e664176..3b3caeb625472c1cd23649144b48654992823c3c 100644 (file)
--- a/tpl/lang/lang_test.go
+++ b/tpl/lang/lang_test.go
@@ -29,6 +29,10 @@ func TestNumFormat(t *testing.T) {
                {0, 12345.6789, "- . ,", "", "12,346"},
                {11, -12345.6789, "- . ,", "", "-12,345.67890000000"},
 
+               {2, 927.675, "- .", "", "927.68"},
+               {2, 1927.675, "- .", "", "1927.68"},
+               {2, 2927.675, "- .", "", "2927.68"},
+
                {3, -12345.6789, "- ,", "", "-12345,679"},
                {6, -12345.6789, "- , .", "", "-12.345,678900"},