Merge pull request #416 from Astavie/master

Add decimal separator option in translation files

src/js/core/utils.js

@@ -413,10 +413,10 @@ function roundSmart(n) {
 /**
  * Formats a big number
  * @param {number} num
- * @param {string=} divider THe divider for numbers like 50,000 (divider=',')
+ * @param {string=} separator The decimal separator for numbers like 50.1 (separator='.')
  * @returns {string}
  */
-export function formatBigNumber(num, divider = ".") {
+export function formatBigNumber(num, separator = T.global.decimalSeparator) {
     const sign = num < 0 ? "-" : "";
     num = Math.abs(num);
 
@@ -445,7 +445,10 @@ export function formatBigNumber(num, divider = ".") {
             }
         }
         const leadingDigitsRounded = round1Digit(leadingDigits);
-        const leadingDigitsNoTrailingDecimal = leadingDigitsRounded.toString().replace(".0", "");
+        const leadingDigitsNoTrailingDecimal = leadingDigitsRounded
+            .toString()
+            .replace(".0", "")
+            .replace(".", separator);
         return sign + leadingDigitsNoTrailingDecimal + suffix;
     }
 }
@@ -453,7 +456,7 @@ export function formatBigNumber(num, divider = ".") {
 /**
  * Formats a big number, but does not add any suffix and instead uses its full representation
  * @param {number} num
- * @param {string=} divider THe divider for numbers like 50,000 (divider=',')
+ * @param {string=} divider The divider for numbers like 50,000 (divider=',')
  * @returns {string}
  */
 export function formatBigNumberFull(num, divider = T.global.thousandsDivider) {
@@ -954,10 +957,13 @@ export function capitalizeFirstLetter(str) {
  * Formats a number like 2.5 to "2.5 items / s"
  * @param {number} speed
  * @param {boolean=} double
+ * @param {string=} separator The decimal separator for numbers like 50.1 (separator='.')
  */
-export function formatItemsPerSecond(speed, double = false) {
+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("<x>", "" + round2Digits(speed)) +
-              (double ? "  " + T.ingame.buildingPlacement.infoTexts.itemsPerSecondDouble : "");
+        : T.ingame.buildingPlacement.infoTexts.itemsPerSecond.replace(
+              "<x>",
+              round2Digits(speed).toString().replace(".", separator)
+          ) + (double ? "  " + T.ingame.buildingPlacement.infoTexts.itemsPerSecondDouble : "");
 }

translations/base-ar.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-cat.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-cz.yaml

@@ -72,6 +72,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-da.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-de.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-el.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-en.yaml

@@ -93,6 +93,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-es.yaml

@@ -92,6 +92,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -599,8 +602,7 @@ storyRewards:
 
     reward_splitter_compact:
         title: Balanceador compacto
-        desc: >-
-        	Has desbloqueado una variante compacta del <strong>balanceador</strong> - ¡Acepta dos entradas y las junta en una salida!
+        desc: Has desbloqueado una variante compacta del <strong>balanceador</strong> - ¡Acepta dos entradas y las junta en una salida!
 
     reward_cutter_quad:
         title: Cortador cuádruple

translations/base-fi.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-fr.yaml

@@ -90,6 +90,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.   cf wikipedia système international d'unité
     # For french: https://fr.wikipedia.org/wiki/Pr%C3%A9fixes_du_Syst%C3%A8me_international_d%27unit%C3%A9s
     suffix:

translations/base-hr.yaml

@@ -120,6 +120,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-hu.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: E

translations/base-it.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-ja.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-kor.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-lt.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-nl.yaml

@@ -90,6 +90,9 @@ global:
 
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
+    
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
 
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:

translations/base-no.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-pl.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     # Translator note: We don't use SI size units for common speak, but if you want to keep it SI
     # ...also, Polish has wierd nature of diffrent number naming, we have "million" and "milliard"-thing wich actually is billion in English

translations/base-pt-BR.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: K

translations/base-pt-PT.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-ro.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-ru.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-sl.yaml

@@ -90,6 +90,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-sv.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-tr.yaml

@@ -91,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: b

translations/base-uk.yaml

@@ -92,6 +92,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k

translations/base-zh-CN.yaml

@@ -119,6 +119,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ""
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # TODO: Chinese translation: suffix changes every 10000 in Chinese numbering system.
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:

translations/base-zh-TW.yaml

@@ -118,6 +118,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: 千