Fix handling of thousands separator (#353)

fmtlib · Jul 11, 2016 · 11bc4b1 · 11bc4b1
1 parent 116914a
commit 11bc4b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/fmt/format.h b/fmt/format.h
@@ -933,6 +933,7 @@ inline void format_decimal(Char *buffer, UInt value, unsigned num_digits,
   }
   unsigned index = static_cast<unsigned>(value * 2);
   *--buffer = Data::DIGITS[index + 1];
+  thousands_sep(buffer);
   *--buffer = Data::DIGITS[index];
 }
 

diff --git a/test/format-test.cc b/test/format-test.cc
@@ -1229,7 +1229,8 @@ TEST(FormatterTest, FormatIntLocale) {
   lconv lc = {};
   char sep[] = "--";
   lc.thousands_sep = sep;
-  EXPECT_CALL(mock, localeconv()).WillOnce(testing::Return(&lc));
+  EXPECT_CALL(mock, localeconv()).Times(2).WillRepeatedly(testing::Return(&lc));
+  EXPECT_EQ("1--234", format("{:n}", 1234));
   EXPECT_EQ("1--234--567", format("{:n}", 1234567));
 }