Merge pull request #151 from jolelievre/fix-cldr-negative

Fix CLDR number formatter for negative values
PrestaShop · Dec 11, 2019 · 30eb649 · 30eb649
2 parents 6e5c5ab + a116cd6
commit 30eb649
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/_dev/cldr/number-formatter.js b/_dev/cldr/number-formatter.js
@@ -80,7 +80,7 @@ class NumberFormatter {
     }
 
     // Get the good CLDR formatting pattern. Sign is important here !
-    const pattern = this.getCldrPattern(majorDigits < 0);
+    const pattern = this.getCldrPattern(number < 0);
     formattedNumber = this.addPlaceholders(formattedNumber, pattern);
     formattedNumber = this.replaceSymbols(formattedNumber);
 
@@ -277,7 +277,13 @@ class NumberFormatter {
   }
 
   static build(specifications) {
-    const symbol = new NumberSymbol(...specifications.symbol);
+    let symbol;
+    if (undefined !== specifications.numberSymbols) {
+      symbol = new NumberSymbol(...specifications.numberSymbols);
+    } else {
+      symbol = new NumberSymbol(...specifications.symbol);
+    }
+
     let specification;
     if (specifications.currencySymbol) {
       specification = new PriceSpecification(

diff --git a/tests/js/cldr/number-formatter.spec.js b/tests/js/cldr/number-formatter.spec.js
@@ -143,6 +143,9 @@ describe('NumberFormatter', () => {
       ['1000000', '$1,000,000.000'],
       ['10000000', '$10,000,000.000'],
       ['100000000', '$100,000,000.000'],
+      ['-10.3', '-$10.300'],
+      ['-125.45672', '-$125.457'],
+      ['-125.45627', '-$125.456'],
     ];
     assertions.forEach((assertion) => {
       it(`test ${assertion[0]} should display ${assertion[1]}`, () => {