From 2781d531a12cfd40564f4eccf213b4a51f66d592 Mon Sep 17 00:00:00 2001 From: hexagonhexagon Date: Sat, 30 May 2020 14:02:03 -0400 Subject: [PATCH] Put suffixes in base-en.yaml under the key global.suffix. --- src/js/core/utils.js | 9 ++++----- translations/base-en.yaml | 7 +++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/js/core/utils.js b/src/js/core/utils.js index 0217f673..e50b71c8 100644 --- a/src/js/core/utils.js +++ b/src/js/core/utils.js @@ -24,7 +24,7 @@ export const BOTTOM = new Vector(0, 1); export const LEFT = new Vector(-1, 0); export const ALL_DIRECTIONS = [TOP, RIGHT, BOTTOM, LEFT]; -const bigNumberSuffixes = ["k", "M", "B", "T"]; +const bigNumberSuffixTranslationKeys = ["thousands", "millions", "billions", "trillions"]; /** * Returns the build id @@ -436,15 +436,14 @@ export function formatBigNumber(num, divider = ".") { } else { let leadingDigits = num; let suffix = ""; - for (let suffixIndex = 0; suffixIndex < bigNumberSuffixes.length; ++suffixIndex) { + for (let suffixIndex = 0; suffixIndex < bigNumberSuffixTranslationKeys.length; ++suffixIndex) { leadingDigits = leadingDigits / 1000; - suffix = bigNumberSuffixes[suffixIndex]; + suffix = T.global.suffix[bigNumberSuffixTranslationKeys[suffixIndex]]; if (leadingDigits < 1000) { break; } } - // round down to nearest 0.1 - const leadingDigitsRounded = Math_floor(leadingDigits * 10) / 10; + const leadingDigitsRounded = round1Digit(leadingDigits); const leadingDigitsNoTrailingDecimal = leadingDigitsRounded.toString().replace(".0", ""); return sign + leadingDigitsNoTrailingDecimal + suffix; } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 9940b0b5..c031cf06 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -26,6 +26,13 @@ global: # How big numbers are rendered, e.g. "10,000" thousandsDivider: "," + # The suffix for large numbers, e.g. 1.3k, 400.2M, etc. + suffix: + thousands: k + millions: M + billions: B + trillions: T + # Shown for infinitely big numbers infinite: inf