diff options
| author | John Wiegley <johnw@newartisans.com> | 2013-09-07 02:22:10 -0700 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2013-09-07 02:22:10 -0700 |
| commit | bba851b8304ef1bb432bb0dc41b1e5c57bc9cc61 (patch) | |
| tree | 485e53f0af0de0ed26af34c8ca05e97e3692746e /src/amount.cc | |
| parent | 0ec4291013bae966df2f5ca504d2216e488cd7ec (diff) | |
| parent | 30b6acb0b012fe0bb37ced1e15dc3315812960d3 (diff) | |
| download | fork-ledger-bba851b8304ef1bb432bb0dc41b1e5c57bc9cc61.tar.gz fork-ledger-bba851b8304ef1bb432bb0dc41b1e5c57bc9cc61.tar.bz2 fork-ledger-bba851b8304ef1bb432bb0dc41b1e5c57bc9cc61.zip | |
Merge pull request #207 from afh/pull/989
Apply --time-colon option only to time commodities
Diffstat (limited to 'src/amount.cc')
| -rw-r--r-- | src/amount.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/amount.cc b/src/amount.cc index 4fe73546..6ff2f4dd 100644 --- a/src/amount.cc +++ b/src/amount.cc @@ -196,8 +196,8 @@ namespace { for (const char * p = buf; *p; p++) { if (*p == '.') { - if (commodity_t::time_colon_by_default || - (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON))) + if (("h" == comm->symbol() || "m" == comm->symbol()) && (commodity_t::time_colon_by_default || + (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON)))) out << ':'; else if (commodity_t::decimal_comma_by_default || (comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA))) @@ -213,8 +213,8 @@ namespace { out << *p; if (integer_digits > 3 && --integer_digits % 3 == 0) { - if (commodity_t::time_colon_by_default || - (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON))) + if (("h" == comm->symbol() || "m" == comm->symbol()) && (commodity_t::time_colon_by_default || + (comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON)))) out << ':'; else if (commodity_t::decimal_comma_by_default || (comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA))) @@ -744,7 +744,7 @@ void amount_t::in_place_unreduce() } if (shifted) { - if ("h" == comm->symbol() && commodity_t::time_colon_by_default) { + if (("h" == comm->symbol() || "m" == comm->symbol()) && commodity_t::time_colon_by_default) { amount_t floored = tmp.floored(); amount_t precision = tmp - floored; if (precision < 0.0) { |