diff options
| author | Minteck <contact@minteck.org> | 2022-05-27 15:11:40 +0200 |
|---|---|---|
| committer | Minteck <contact@minteck.org> | 2022-05-27 15:11:40 +0200 |
| commit | 7d1c7859cdbdbd2407426ac6c72e501bab1dd47b (patch) | |
| tree | db81b1903a0238af89f6ad76c33aa0fc7b651005 /refresh/servers.js | |
| parent | 02d6c9e573f4827940b688d9320bbde4e481ea77 (diff) | |
| parent | dfd7f291f1d3c14a883cd412aff55f0f525b6dec (diff) | |
| download | vaportrail-7d1c7859cdbdbd2407426ac6c72e501bab1dd47b.tar.gz vaportrail-7d1c7859cdbdbd2407426ac6c72e501bab1dd47b.tar.bz2 vaportrail-7d1c7859cdbdbd2407426ac6c72e501bab1dd47b.zip | |
Merge branch 'mane' of https://git.equestria.dev/equestria.dev/vaportrail into mane
Diffstat (limited to 'refresh/servers.js')
| -rw-r--r-- | refresh/servers.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/refresh/servers.js b/refresh/servers.js index 8bbdbd5..d46355f 100644 --- a/refresh/servers.js +++ b/refresh/servers.js @@ -53,18 +53,21 @@ function createReadableUptime(timestamp) { let daysString = " Day"; if(days == 0) daysString = ""; if(days > 1) daysString = daysString + "s"; - if(days != 0 && hours != 0) daysString = days + daysString + ", "; + if(days != 0) daysString = days + daysString + ", "; let hoursString = " Hour"; if(hours == 0) hoursString = ""; if(hours > 1) hoursString = hoursString + "s"; - if(hours != 0) hoursString = hours + hoursString + ", and "; + if(hours != 0) hoursString = hours + hoursString + ", "; + + let andString = ""; + if((hours != 0) || (days != 0)) andString = "and "; let minutesString = " Minute"; if(minutes == 0) minutesString = ""; if(minutes > 1) minutesString = minutes + minutesString + "s"; - return daysString + hoursString + minutesString; + return daysString + hoursString + andString + minutesString; } module.exports = () => { |