GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

helper: Corrected use of obsolete date names

Browse source
This commit is contained in:
Paul Beckingham 2017-03-08 08:09:03 -05:00
parent 3000dceca5
commit 63da0dee1f
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/helper.cpp
View file

@ -144,10 +144,10 @@ bool expandIntervalHint (
{
{":yesterday", {"yesterday", "today"}},
{":day", {"today", "eod"}},
{":week", {"socw", "eocw"}},
{":month", {"socm", "eocm"}},
{":quarter", {"socq", "eocq"}},
{":year", {"socy", "eocy"}},
{":week", {"sow", "eow"}},
{":month", {"som", "eom"}},
{":quarter", {"soq", "eoq"}},
{":year", {"soy", "eoy"}},
};
static std::vector <std::string> dayNames
@ -176,17 +176,17 @@ bool expandIntervalHint (
// Some require math.
if (hint == ":lastweek")
{
// Note: Simply subtracting (7 * 86400) from socw, eocw fails to consider
// Note: Simply subtracting (7 * 86400) from sow, eow fails to consider
// daylight savings.
Datetime socw ("socw");
int sy = socw.year ();
int sm = socw.month ();
int sd = socw.day ();
Datetime sow ("sow");
int sy = sow.year ();
int sm = sow.month ();
int sd = sow.day ();
Datetime eocw ("eocw");
int ey = eocw.year ();
int em = eocw.month ();
int ed = eocw.day ();
Datetime eow ("eow");
int ey = eow.year ();
int em = eow.month ();
int ed = eow.day ();
sd -= 7;
if (sd < 1)