From b259c7576ae5d9afb0b095b37e1289c0847c7984 Mon Sep 17 00:00:00 2001 From: TimerErTim Date: Sun, 23 May 2021 16:39:34 +0200 Subject: [PATCH] Fix formatItemsPerSecond with double = true (#1148) * Show double flag with items per second being 1 formatItemsPerSecond in utils.js does not indicate two items being processed in a building if speed is exactly one item per second. That is now fixed. * Fix code style to fit guidelines --- src/js/core/utils.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/js/core/utils.js b/src/js/core/utils.js index 6eed9c34..8f6bb5d6 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -573,12 +573,14 @@ export function round1DigitLocalized(speed, separator = T.global.decimalSeparato * @param {string=} separator The decimal separator for numbers like 50.1 (separator='.') */ export function formatItemsPerSecond(speed, double = false, separator = T.global.decimalSeparator) { - return speed === 1.0 - ? T.ingame.buildingPlacement.infoTexts.oneItemPerSecond - : T.ingame.buildingPlacement.infoTexts.itemsPerSecond.replace( - "", - round2Digits(speed).toString().replace(".", separator) - ) + (double ? " " + T.ingame.buildingPlacement.infoTexts.itemsPerSecondDouble : ""); + return ( + (speed === 1.0 + ? T.ingame.buildingPlacement.infoTexts.oneItemPerSecond + : T.ingame.buildingPlacement.infoTexts.itemsPerSecond.replace( + "", + round2Digits(speed).toString().replace(".", separator) + )) + (double ? "ยทยท" + T.ingame.buildingPlacement.infoTexts.itemsPerSecondDouble : "") + ); } /**