fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-08-01 03:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle global locale

Browse Source
This commit is contained in:
Victor Zverovich
2021-08-14 09:38:41 -07:00
parent 6ea6cf9464
commit 11d49491cb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/format.h
View File

@@ -1430,8 +1430,8 @@ template <typename Char> class digit_grouping {
} }
public: public:
explicit digit_grouping(locale_ref loc) { explicit digit_grouping(locale_ref loc, bool localized = true) {
if (loc) if (localized)
sep_ = thousands_sep<Char>(loc); sep_ = thousands_sep<Char>(loc);
else else
sep_.thousands_sep = Char(); sep_.thousands_sep = Char();
@@ -1806,7 +1806,7 @@ auto write_float(OutputIt out, const DecimalFP& fp,
if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 1; if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 1;
if (num_zeros > 0) size += to_unsigned(num_zeros) + 1; if (num_zeros > 0) size += to_unsigned(num_zeros) + 1;
} }
auto grouping = digit_grouping<Char>(loc); auto grouping = digit_grouping<Char>(loc, fspecs.locale);
size += to_unsigned(grouping.count_separators(significand_size)); size += to_unsigned(grouping.count_separators(significand_size));
return write_padded<align::right>(out, specs, size, [&](iterator it) { return write_padded<align::right>(out, specs, size, [&](iterator it) {
if (sign) *it++ = static_cast<Char>(data::signs[sign]); if (sign) *it++ = static_cast<Char>(data::signs[sign]);
@@ -1820,7 +1820,7 @@ auto write_float(OutputIt out, const DecimalFP& fp,
// 1234e-2 -> 12.34[0+] // 1234e-2 -> 12.34[0+]
int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0; int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0;
size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0); size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0);
auto grouping = digit_grouping<Char>(loc); auto grouping = digit_grouping<Char>(loc, fspecs.locale);
size += to_unsigned(grouping.count_separators(significand_size)); size += to_unsigned(grouping.count_separators(significand_size));
return write_padded<align::right>(out, specs, size, [&](iterator it) { return write_padded<align::right>(out, specs, size, [&](iterator it) {
if (sign) *it++ = static_cast<Char>(data::signs[sign]); if (sign) *it++ = static_cast<Char>(data::signs[sign]);