From 8505b1621d7a8f5f4442e57605c24b650656fb8b Mon Sep 17 00:00:00 2001 From: Zohnannor <35764628+Zohnannor@users.noreply.github.com> Date: Mon, 25 Jan 2021 19:02:24 +0300 Subject: [PATCH] Update CM.Disp.FormatTime Add years to date formatting, fixes #502 --- CookieMonster.js | 1 + 1 file changed, 1 insertion(+) diff --git a/CookieMonster.js b/CookieMonster.js index b690a6d..bed6c54 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1328,6 +1328,7 @@ CM.Disp.FormatTime = function(time, longFormat) { str += (s < 10 ? '0' : '') + s + ':'; } else { if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d'; + str += (y > 0 ? y + (longFormat ? (y == 1 ? ' year' : ' years') : 'y') + ', ': ""); str += (d > 0 ? d + (longFormat ? (d == 1 ? ' day' : ' days') : 'd') + ', ': ""); if (str.length > 0 || h > 0) str += h + (longFormat ? (h == 1 ? ' hour' : ' hours') : 'h') + ', '; if (str.length > 0 || m > 0) str += m + (longFormat ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';