diff --git a/ATxCommon/TimeUtils.cs b/ATxCommon/TimeUtils.cs index 552ebf6f530f6edb899778db9024618f928f4659..fae6dfde01ebb23d1d2d75f8cb35460278e42bf7 100644 --- a/ATxCommon/TimeUtils.cs +++ b/ATxCommon/TimeUtils.cs @@ -47,6 +47,8 @@ namespace ATxCommon const int hour = minute * 60; const int day = hour * 24; const int week = day * 7; + const int month = day * 30; + const int year = day * 365; if (delta < minute) return $"{delta} seconds {desc}"; @@ -68,7 +70,14 @@ namespace ATxCommon if (delta < 2 * week) return $"{delta / day} days ${desc}"; - return delta / week + " weeks"; + if (delta < 2 * month) + return $"{delta / week} weeks {desc}"; + + // TODO: make the remaining options more flexible (like "< day" above) + if (delta < year) + return $"{delta / month} monts {desc}"; + + return $"{delta / year} years {desc}"; } /// <summary>