From c4d328c1cd12a25c6aeafb34669cbc68e3f97b7f Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 28 Jun 2020 10:48:47 +0200 Subject: [PATCH] Fix bad time formatting and update changelog --- src/js/changelog.js | 8 ++++++++ src/js/core/utils.js | 6 +++--- version | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/js/changelog.js b/src/js/changelog.js index f079cafa..b82a541c 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,4 +1,12 @@ export const CHANGELOG = [ + { + version: "1.1.19", + date: "unreleased", + entries: [ + "Allow holding ALT in belt planner to reverse direction (by jakobhellermann)", + "Clear cursor when trying to pipette the same building twice (by hexy)", + ], + }, { version: "1.1.18", date: "27.06.2020", diff --git a/src/js/core/utils.js b/src/js/core/utils.js index 75bc2902..f1da316a 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -879,17 +879,17 @@ export function formatSecondsToTimeAgo(secs) { const hours = Math.floor(minutes / 60); const days = Math.floor(hours / 24); - if (seconds <= 60) { + if (seconds < 60) { if (seconds <= 1) { return T.global.time.oneSecondAgo; } return T.global.time.xSecondsAgo.replace("", "" + seconds); - } else if (minutes <= 60) { + } else if (minutes < 60) { if (minutes <= 1) { return T.global.time.oneMinuteAgo; } return T.global.time.xMinutesAgo.replace("", "" + minutes); - } else if (hours <= 60) { + } else if (hours < 24) { if (hours <= 1) { return T.global.time.oneHourAgo; } diff --git a/version b/version index b0c8928e..3a21f22a 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.18 \ No newline at end of file +1.1.19 \ No newline at end of file