david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip

Browse Source
This commit is contained in:
Daniel van Noord
2021-01-25 22:32:53 +01:00
parent 55c6b5db8b 51ab15f2ec
commit c08cefd1a6
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CookieMonster.js
View File

@@ -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') + ', ';