Fix thousands separator (#11)

igitur · andersnm · commit 3c9a2a612654 · 2017-11-23T18:19:26.000+01:00
* Fix thousands separator

* Changes after feedback
diff --git a/src/ExcelNumberFormat/Formatter.cs b/src/ExcelNumberFormat/Formatter.cs
@@ -371,7 +371,7 @@ public static void FormatThousands(string valueString, bool thousandSeparator, b
 
                     FormatPlaceholder(token, c, significant, result);
 
-                    if (significant && thousandSeparator)
+                    if (thousandSeparator && (significant || token.Equals("0")))
                         FormatThousandSeparator(valueString, digitIndex, culture, result);
 
                     digitIndex++;
diff --git a/test/ExcelNumberFormat.Tests/Class1.cs b/test/ExcelNumberFormat.Tests/Class1.cs
@@ -423,6 +423,13 @@ public void TestComma()
 
         }
 
+        [TestMethod]
+        public void TestThousandSeparator()
+        {
+            var actual = Format(1469.07, "0,000,000.00", CultureInfo.InvariantCulture);
+            Assert.AreEqual("0,001,469.07", actual);
+        }
+
         void TestValid(string format)
         {
             var to = new NumberFormat(format);

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,13 @@ public void TestComma()`
`423`	`423`
`424`	`424`	`}`
`425`	`425`
	`426`	`+ [TestMethod]`
	`427`	`+ public void TestThousandSeparator()`
	`428`	`+ {`
	`429`	`+ var actual = Format(1469.07, "0,000,000.00", CultureInfo.InvariantCulture);`
	`430`	`+ Assert.AreEqual("0,001,469.07", actual);`
	`431`	`+ }`
	`432`	`+`
`426`	`433`	`void TestValid(string format)`
`427`	`434`	`{`
`428`	`435`	`var to = new NumberFormat(format);`