From 523d4243e8c347cb7cbd1f68b03a5098ceb73b70 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Nov 2009 18:30:35 -0500 Subject: Made --european more pervasive in its effect --- src/amount.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/amount.cc b/src/amount.cc index e9b971f8..8c78a86c 100644 --- a/src/amount.cc +++ b/src/amount.cc @@ -669,7 +669,8 @@ namespace { for (const char * p = buf; *p; p++) { if (*p == '.') { - if (comm && comm->has_flags(COMMODITY_STYLE_EUROPEAN)) + if (commodity_t::european_by_default || + (comm && comm->has_flags(COMMODITY_STYLE_EUROPEAN))) out << ','; else out << *p; @@ -682,7 +683,8 @@ namespace { out << *p; if (integer_digits > 3 && --integer_digits % 3 == 0) { - if (comm && comm->has_flags(COMMODITY_STYLE_EUROPEAN)) + if (commodity_t::european_by_default || + (comm && comm->has_flags(COMMODITY_STYLE_EUROPEAN))) out << '.'; else out << ','; @@ -977,12 +979,14 @@ bool amount_t::parse(std::istream& in, const parse_flags_t& flags) } } else if (last_comma != string::npos && - commodity().has_flags(COMMODITY_STYLE_EUROPEAN)) { + (commodity_t::european_by_default || + commodity().has_flags(COMMODITY_STYLE_EUROPEAN))) { comm_flags |= COMMODITY_STYLE_EUROPEAN; quantity->prec = static_cast(quant.length() - last_comma - 1); } else if (last_period != string::npos && - ! (commodity().has_flags(COMMODITY_STYLE_EUROPEAN))) { + ! (commodity_t::european_by_default || + commodity().has_flags(COMMODITY_STYLE_EUROPEAN))) { quantity->prec = static_cast(quant.length() - last_period - 1); } else { -- cgit v1.2.3