diff --git a/ChangeLog b/ChangeLog index a1c00144c..7b4b14513 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ - TW-261 Easy to create "not deletable" task (thanks to Jan Kunder). - TW-278 Cygwin throws warnings building mk_wcwidth() in wcwidth6.c. - TW-285 DUETODAY doesn't give any output (thanks to Jostein Berntsen). +- TW-306 Wrong date format in burndown view (thanks to Michele Santullo). - TW-1254 Calc command can segfault on negative numbers (thanks to Renato Alves). - TW-1255 New testing framework (thanks to Renato Alves). diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp index 9948dc2f4..77c2ef058 100644 --- a/src/commands/CmdBurndown.cpp +++ b/src/commands/CmdBurndown.cpp @@ -936,7 +936,12 @@ void Chart::calculateRates (std::vector & sequence) OldDuration delta (remaining_days * 86400); now += delta; - _completion = now.toString (context.config.get ("dateformat")) + // Prefer dateformat.report over dateformat. + std::string format = context.config.get ("dateformat.report"); + if (format == "") + format = context.config.get ("dateformat"); + + _completion = now.toString (format) + " (" + delta.format () + ")";