diff options
author | John Wiegley <johnw@newartisans.com> | 2009-10-25 21:27:56 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2009-10-25 21:27:56 -0400 |
commit | 9dadaebfeb461ba795124281018d0f7eac200cf4 (patch) | |
tree | 941243868b1dcacd68cbd52a2f96e40bf70a5d3b /src/global.cc | |
parent | f35bc939c96c3a3bf09c5881d638b5ba60449c03 (diff) | |
parent | e696bfd913a10edd19f9e35eb1aee2c97b11e7f6 (diff) | |
download | fork-ledger-9dadaebfeb461ba795124281018d0f7eac200cf4.tar.gz fork-ledger-9dadaebfeb461ba795124281018d0f7eac200cf4.tar.bz2 fork-ledger-9dadaebfeb461ba795124281018d0f7eac200cf4.zip |
Merge branch 'next'
Diffstat (limited to 'src/global.cc')
-rw-r--r-- | src/global.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/global.cc b/src/global.cc index 24716fae..02c9e79a 100644 --- a/src/global.cc +++ b/src/global.cc @@ -433,8 +433,10 @@ void global_scope_t::normalize_report_options(const string& verb) rep.session.commodity_pool->price_db = none; if (rep.HANDLED(date_format_)) { - output_datetime_format = rep.HANDLER(date_format_).str() + " %H:%M:%S"; - output_date_format = rep.HANDLER(date_format_).str(); + set_date_format(rep.HANDLER(date_format_).str().c_str()); + } + if (rep.HANDLED(datetime_format_)) { + set_datetime_format(rep.HANDLER(datetime_format_).str().c_str()); } if (rep.HANDLED(start_of_week_)) { if (optional<date_time::weekdays> weekday = |