diff --git a/ChangeLog b/ChangeLog index 41355afa7..754e3f5aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ + Fixed bug that cause the _forcecolor configuration variable to be considered obsolete (thank to Bruce Dillahunty). + Fixed documentation errors (thanks to Thomas@BIC). + + The 'weekstart' configuration variable now controls the 'calendar' + command (thanks to Federico Hernandez). ------ old releases ------------------------------ diff --git a/html/task.html b/html/task.html index f0bbff086..041b55575 100644 --- a/html/task.html +++ b/html/task.html @@ -136,6 +136,8 @@
diff --git a/src/report.cpp b/src/report.cpp index 135576858..00d36c4a3 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -1347,10 +1347,10 @@ std::string handleReportTimesheet (TDB& tdb, T& task, Config& conf) filter (tasks, task); // What day of the week does the user consider the first? - int weekStart = Date::dayOfWeek (conf.get ("weekstart", "Monday")); - if (weekStart == -1) - throw std::string ("The 'weekstart' configuration variable does " - "not contain a day name, such as 'Monday'."); + int weekStart = Date::dayOfWeek (conf.get ("weekstart", "Sunday")); + if (weekStart != 0 && weekStart != 1) + throw std::string ("The 'weekstart' configuration variable may " + "only contain 'Sunday' or 'Monday'."); // Determine the date of the first day of the most recent report. Date today; @@ -1540,8 +1540,9 @@ std::string renderMonths ( Table table; table.setDateFormat (conf.get ("dateformat", "m/d/Y")); + // What day of the week does the user consider the first? int weekStart = Date::dayOfWeek (conf.get ("weekstart", "Sunday")); - if ((weekStart != 0) && (weekStart != 1)) + if (weekStart != 0 && weekStart != 1) throw std::string ("The 'weekstart' configuration variable may " "only contain 'Sunday' or 'Monday'.");