GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-27 19:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug Fix - unit tests util.t

Browse source 
- Algorithm uses different numbers to represent a year in the same
  condition.  Bad.
This commit is contained in:
Paul Beckingham 2009-12-12 11:41:47 -05:00
parent eaeca45eae
commit 5a66ac94ee
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/util.cpp
View file

@ -164,13 +164,13 @@ std::string formatSeconds (time_t delta)
char formatted[24]; char formatted[24];
float days = (float) delta / 86400.0; float days = (float) delta / 86400.0;
if (days >= 365) if (delta >= 86400 * 365)
sprintf (formatted, "%.1f yrs", (days / 365.2422)); // TODO i18n sprintf (formatted, "%.1f yrs", (days / 365)); // TODO i18n
else if (days > 84) else if (delta > 86400 * 84)
sprintf (formatted, "%1d mth%s", // TODO i18n sprintf (formatted, "%1d mth%s", // TODO i18n
(int) (days / 30.6), (int) (days / 30.6),
((int) (days / 30.6) == 1 ? "" : "s")); // TODO i18n ((int) (days / 30.6) == 1 ? "" : "s")); // TODO i18n
else if (days > 13) else if (delta > 86400 * 13)
sprintf (formatted, "%d wk%s", // TODO i18n sprintf (formatted, "%d wk%s", // TODO i18n
(int) (days / 7.0), (int) (days / 7.0),
((int) (days / 7.0) == 1 ? "" : "s")); // TODO i18n ((int) (days / 7.0) == 1 ? "" : "s")); // TODO i18n
@ -203,9 +203,9 @@ std::string formatSecondsCompact (time_t delta)
char formatted[24]; char formatted[24];
float days = (float) delta / 86400.0; float days = (float) delta / 86400.0;
if (days >= 365) sprintf (formatted, "%.1fy", (days / 365.2422)); // TODO i18n if (delta >= 86400 * 365) sprintf (formatted, "%.1fy", (days / 365)); // TODO i18n
else if (days > 84) sprintf (formatted, "%1dmo", (int) (days / 30.6)); // TODO i18n else if (delta >= 86400 * 84) sprintf (formatted, "%1dmo", (int) (days / 30.6)); // TODO i18n
else if (days > 13) sprintf (formatted, "%dwk", (int) (days / 7.0)); // TODO i18n else if (delta >= 86400 * 13) sprintf (formatted, "%dwk", (int) (days / 7.0)); // TODO i18n
else if (delta >= 86400) sprintf (formatted, "%dd", (int) days); // TODO i18n else if (delta >= 86400) sprintf (formatted, "%dd", (int) days); // TODO i18n
else if (delta >= 3600) sprintf (formatted, "%dh", (int) (delta / 3600)); // TODO i18n else if (delta >= 3600) sprintf (formatted, "%dh", (int) (delta / 3600)); // TODO i18n
else if (delta >= 60) sprintf (formatted, "%dm", (int) (delta / 60)); // TODO i18n else if (delta >= 60) sprintf (formatted, "%dm", (int) (delta / 60)); // TODO i18n