improved numberformatter, fixed tests

55 files changed, 55 insertions, 111 deletions

diff --git a/plugins/Intl/Commands/GenerateIntl.php b/plugins/Intl/Commands/GenerateIntl.php
index 42195ea969..97a00792cc 100644
--- a/plugins/Intl/Commands/GenerateIntl.php
+++ b/plugins/Intl/Commands/GenerateIntl.php
@@ -335,15 +335,13 @@ class GenerateIntl extends ConsoleCommand
             $unitsData = $unitsData['main'][$requestLangCode]['numbers'];
 
             $numberingSystem = $unitsData['defaultNumberingSystem'];
-            $numberFormats   = explode(';', $unitsData['decimalFormats-numberSystem-' . $numberingSystem]['standard']);
 
             $translations['Intl']['NumberSymbolDecimal']  = $unitsData['symbols-numberSystem-' . $numberingSystem]['decimal'];
             $translations['Intl']['NumberSymbolGroup']    = $unitsData['symbols-numberSystem-' . $numberingSystem]['group'];
             $translations['Intl']['NumberSymbolPercent']  = $unitsData['symbols-numberSystem-' . $numberingSystem]['percentSign'];
             $translations['Intl']['NumberSymbolPlus']     = $unitsData['symbols-numberSystem-' . $numberingSystem]['plusSign'];
             $translations['Intl']['NumberSymbolMinus']    = $unitsData['symbols-numberSystem-' . $numberingSystem]['minusSign'];
-            $translations['Intl']['NumberFormat']         = $numberFormats[0];
-            $translations['Intl']['NumberFormatNegative'] = isset($numberFormats[1]) ? $numberFormats[1] : ('-'.$numberFormats[0]);
+            $translations['Intl']['NumberFormatNumber']   = $unitsData['decimalFormats-numberSystem-' . $numberingSystem]['standard'];
             $translations['Intl']['NumberFormatPercent']  = $unitsData['percentFormats-numberSystem-' . $numberingSystem]['standard'];
 
             $output->writeln('Saved number formatting data for ' . $langCode);
diff --git a/plugins/Intl/lang/am.json b/plugins/Intl/lang/am.json
index 88d84d3d11..04f60fcd0a 100644
--- a/plugins/Intl/lang/am.json
+++ b/plugins/Intl/lang/am.json
@@ -539,8 +539,7 @@
         "NMinutesShort": "%s ደቂቃ",
         "NSeconds": "%s ሰከንዶች",
         "NSecondsShort": "%s ሰ",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/ar.json b/plugins/Intl/lang/ar.json
index a951704cce..e0fe35ab53 100644
--- a/plugins/Intl/lang/ar.json
+++ b/plugins/Intl/lang/ar.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s د",
         "NSeconds": "%s ثانية",
         "NSecondsShort": "%s ث",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": "٫",
         "NumberSymbolGroup": "٬",
diff --git a/plugins/Intl/lang/be.json b/plugins/Intl/lang/be.json
index fa8a8a638f..9b23011830 100644
--- a/plugins/Intl/lang/be.json
+++ b/plugins/Intl/lang/be.json
@@ -516,8 +516,7 @@
         "NMinutesShort": "%s хв.",
         "NSeconds": "%s секунды",
         "NSecondsShort": "%sс",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/bg.json b/plugins/Intl/lang/bg.json
index 36fedf34ff..ea11785a82 100644
--- a/plugins/Intl/lang/bg.json
+++ b/plugins/Intl/lang/bg.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s секунди",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/bn.json b/plugins/Intl/lang/bn.json
index ec55e36ec2..316a8c1a65 100644
--- a/plugins/Intl/lang/bn.json
+++ b/plugins/Intl/lang/bn.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s মিনিট",
         "NSeconds": "%s সেকেন্ড",
         "NSecondsShort": "%s সেকেন্ড",
-        "NumberFormat": "#,##,##0.###",
-        "NumberFormatNegative": "-#,##,##0.###",
+        "NumberFormatNumber": "#,##,##0.###",
         "NumberFormatPercent": "#,##,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/bs.json b/plugins/Intl/lang/bs.json
index 7b10e44f99..a924c94b9e 100644
--- a/plugins/Intl/lang/bs.json
+++ b/plugins/Intl/lang/bs.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekundi",
         "NSecondsShort": "%s sek",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/ca.json b/plugins/Intl/lang/ca.json
index d71fe0c7c9..76d45c21ea 100644
--- a/plugins/Intl/lang/ca.json
+++ b/plugins/Intl/lang/ca.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s segons",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/cs.json b/plugins/Intl/lang/cs.json
index db73f1f539..a033223a23 100644
--- a/plugins/Intl/lang/cs.json
+++ b/plugins/Intl/lang/cs.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekund",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/cy.json b/plugins/Intl/lang/cy.json
index f06ab8923a..decf4b5bf0 100644
--- a/plugins/Intl/lang/cy.json
+++ b/plugins/Intl/lang/cy.json
@@ -549,8 +549,7 @@
         "NMinutesShort": "%s mun",
         "NSeconds": "%s eiliad",
         "NSecondsShort": "%s eil",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/da.json b/plugins/Intl/lang/da.json
index 38e0271cca..cf46661588 100644
--- a/plugins/Intl/lang/da.json
+++ b/plugins/Intl/lang/da.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min.",
         "NSeconds": "%s sekunder",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/de.json b/plugins/Intl/lang/de.json
index b77dd668ed..b2ebb8f027 100644
--- a/plugins/Intl/lang/de.json
+++ b/plugins/Intl/lang/de.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s Min.",
         "NSeconds": "%s Sekunden",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/el.json b/plugins/Intl/lang/el.json
index e83407ad6c..7ec469b2ec 100644
--- a/plugins/Intl/lang/el.json
+++ b/plugins/Intl/lang/el.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s λεπ.",
         "NSeconds": "%s δευτερόλεπτα",
         "NSecondsShort": "%s δ",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/en.json b/plugins/Intl/lang/en.json
index 9847168eea..5703605403 100644
--- a/plugins/Intl/lang/en.json
+++ b/plugins/Intl/lang/en.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s seconds",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/es.json b/plugins/Intl/lang/es.json
index 8f8c5dbb64..dd795468a0 100644
--- a/plugins/Intl/lang/es.json
+++ b/plugins/Intl/lang/es.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s segundos",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/et.json b/plugins/Intl/lang/et.json
index 0898d97706..2455275a6c 100644
--- a/plugins/Intl/lang/et.json
+++ b/plugins/Intl/lang/et.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekundit",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/eu.json b/plugins/Intl/lang/eu.json
index 9129f21c20..c544e2ad4e 100644
--- a/plugins/Intl/lang/eu.json
+++ b/plugins/Intl/lang/eu.json
@@ -525,8 +525,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s segundo",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "% #,##0",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/fa.json b/plugins/Intl/lang/fa.json
index 0267f1cbee..11132366e8 100644
--- a/plugins/Intl/lang/fa.json
+++ b/plugins/Intl/lang/fa.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s دقیقه",
         "NSeconds": "%s ثانیه",
         "NSecondsShort": "%s ث",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": "٫",
         "NumberSymbolGroup": "٬",
diff --git a/plugins/Intl/lang/fi.json b/plugins/Intl/lang/fi.json
index 5777563f9c..92dde341a1 100644
--- a/plugins/Intl/lang/fi.json
+++ b/plugins/Intl/lang/fi.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekuntia",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/fr.json b/plugins/Intl/lang/fr.json
index c96ac9964e..fd86bb49e4 100644
--- a/plugins/Intl/lang/fr.json
+++ b/plugins/Intl/lang/fr.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s secondes",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/gl.json b/plugins/Intl/lang/gl.json
index 53af791d84..d2559979c1 100644
--- a/plugins/Intl/lang/gl.json
+++ b/plugins/Intl/lang/gl.json
@@ -523,8 +523,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s segundos",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/he.json b/plugins/Intl/lang/he.json
index ccd7181960..cbd03f933b 100644
--- a/plugins/Intl/lang/he.json
+++ b/plugins/Intl/lang/he.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s דק׳",
         "NSeconds": "%s שניות",
         "NSecondsShort": "%s שנ׳",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/hi.json b/plugins/Intl/lang/hi.json
index e820bc4517..f8b107a293 100644
--- a/plugins/Intl/lang/hi.json
+++ b/plugins/Intl/lang/hi.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s मि.",
         "NSeconds": "%s सेकंड",
         "NSecondsShort": "%sसे.",
-        "NumberFormat": "#,##,##0.###",
-        "NumberFormatNegative": "-#,##,##0.###",
+        "NumberFormatNumber": "#,##,##0.###",
         "NumberFormatPercent": "#,##,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/hr.json b/plugins/Intl/lang/hr.json
index bb1881be4e..631a993b19 100644
--- a/plugins/Intl/lang/hr.json
+++ b/plugins/Intl/lang/hr.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekundi",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/hu.json b/plugins/Intl/lang/hu.json
index d3176ed4ee..289f60dfcb 100644
--- a/plugins/Intl/lang/hu.json
+++ b/plugins/Intl/lang/hu.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s másodperc",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/id.json b/plugins/Intl/lang/id.json
index caec4e10b8..702377c9c7 100644
--- a/plugins/Intl/lang/id.json
+++ b/plugins/Intl/lang/id.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s mnt",
         "NSeconds": "%s detik",
         "NSecondsShort": "%s dtk",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/is.json b/plugins/Intl/lang/is.json
index 716de6a460..179a3a5ad7 100644
--- a/plugins/Intl/lang/is.json
+++ b/plugins/Intl/lang/is.json
@@ -553,8 +553,7 @@
         "NMinutesShort": "%s mín.",
         "NSeconds": "%s sekúndur",
         "NSecondsShort": "%s sek.",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/it.json b/plugins/Intl/lang/it.json
index 2c57a591b8..d4106a67e4 100644
--- a/plugins/Intl/lang/it.json
+++ b/plugins/Intl/lang/it.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s secondi",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/ja.json b/plugins/Intl/lang/ja.json
index 96c3981f50..1237b0837b 100644
--- a/plugins/Intl/lang/ja.json
+++ b/plugins/Intl/lang/ja.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s 分",
         "NSeconds": "%s 秒",
         "NSecondsShort": "%s秒",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/ka.json b/plugins/Intl/lang/ka.json
index d719ed4b69..2bcae0c62c 100644
--- a/plugins/Intl/lang/ka.json
+++ b/plugins/Intl/lang/ka.json
@@ -536,8 +536,7 @@
         "NMinutesShort": "%s წთ",
         "NSeconds": "%s წამი",
         "NSecondsShort": "%sწმ",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/ko.json b/plugins/Intl/lang/ko.json
index 7b2845c0d4..e42483c59f 100644
--- a/plugins/Intl/lang/ko.json
+++ b/plugins/Intl/lang/ko.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s분",
         "NSeconds": "%s초",
         "NSecondsShort": "%s초",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/lt.json b/plugins/Intl/lang/lt.json
index bcef2fe9d8..d49c6ad54e 100644
--- a/plugins/Intl/lang/lt.json
+++ b/plugins/Intl/lang/lt.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min.",
         "NSeconds": "%s sekundžių",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/lv.json b/plugins/Intl/lang/lv.json
index 939de3e332..e503026355 100644
--- a/plugins/Intl/lang/lv.json
+++ b/plugins/Intl/lang/lv.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min.",
         "NSeconds": "%s sekundes",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/nb.json b/plugins/Intl/lang/nb.json
index 4ef7090326..47699e558a 100644
--- a/plugins/Intl/lang/nb.json
+++ b/plugins/Intl/lang/nb.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekunder",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/nl.json b/plugins/Intl/lang/nl.json
index 78df9a1aeb..8ea4f8f24d 100644
--- a/plugins/Intl/lang/nl.json
+++ b/plugins/Intl/lang/nl.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s seconden",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/nn.json b/plugins/Intl/lang/nn.json
index 243b16bddb..2bbaa39b18 100644
--- a/plugins/Intl/lang/nn.json
+++ b/plugins/Intl/lang/nn.json
@@ -551,8 +551,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s s",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/pl.json b/plugins/Intl/lang/pl.json
index a4dc8c2777..779af3f6b2 100644
--- a/plugins/Intl/lang/pl.json
+++ b/plugins/Intl/lang/pl.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekundy",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/pt-br.json b/plugins/Intl/lang/pt-br.json
index 53e2a69cff..2fb5c928d6 100644
--- a/plugins/Intl/lang/pt-br.json
+++ b/plugins/Intl/lang/pt-br.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s segundos",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/pt.json b/plugins/Intl/lang/pt.json
index efb4666688..5391e15487 100644
--- a/plugins/Intl/lang/pt.json
+++ b/plugins/Intl/lang/pt.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s segundos",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/ro.json b/plugins/Intl/lang/ro.json
index 74f4db292a..90d7a0bf0d 100644
--- a/plugins/Intl/lang/ro.json
+++ b/plugins/Intl/lang/ro.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min.",
         "NSeconds": "%s de secunde",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/ru.json b/plugins/Intl/lang/ru.json
index 2c3cc02555..e4f78b4513 100644
--- a/plugins/Intl/lang/ru.json
+++ b/plugins/Intl/lang/ru.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s мин",
         "NSeconds": "%s секунды",
         "NSecondsShort": "%s с",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/sk.json b/plugins/Intl/lang/sk.json
index 0b18395e65..2dd65c7397 100644
--- a/plugins/Intl/lang/sk.json
+++ b/plugins/Intl/lang/sk.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekúnd",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/sl.json b/plugins/Intl/lang/sl.json
index 8eb7e00cfe..748bbc3592 100644
--- a/plugins/Intl/lang/sl.json
+++ b/plugins/Intl/lang/sl.json
@@ -553,8 +553,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekund",
         "NSecondsShort": "%s s",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/sq.json b/plugins/Intl/lang/sq.json
index 22d4471d39..b54d001958 100644
--- a/plugins/Intl/lang/sq.json
+++ b/plugins/Intl/lang/sq.json
@@ -507,8 +507,7 @@
         "NMinutesShort": "%s min.",
         "NSeconds": "%s sekonda",
         "NSecondsShort": "%s sek.",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/sr.json b/plugins/Intl/lang/sr.json
index b5c090b680..8d9ef65100 100644
--- a/plugins/Intl/lang/sr.json
+++ b/plugins/Intl/lang/sr.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s мин",
         "NSeconds": "%s секунди",
         "NSecondsShort": "%s сек",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/sv.json b/plugins/Intl/lang/sv.json
index 5188d9eb88..c92a3e1ebf 100644
--- a/plugins/Intl/lang/sv.json
+++ b/plugins/Intl/lang/sv.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s min",
         "NSeconds": "%s sekunder",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0 %",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/ta.json b/plugins/Intl/lang/ta.json
index 8b5a6cb4f5..477950426b 100644
--- a/plugins/Intl/lang/ta.json
+++ b/plugins/Intl/lang/ta.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s நிமிட",
         "NSeconds": "%s விநாடிகள்",
         "NSecondsShort": "%s வி.",
-        "NumberFormat": "#,##,##0.###",
-        "NumberFormatNegative": "-#,##,##0.###",
+        "NumberFormatNumber": "#,##,##0.###",
         "NumberFormatPercent": "#,##,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/te.json b/plugins/Intl/lang/te.json
index d7d87bba08..fc54933b61 100644
--- a/plugins/Intl/lang/te.json
+++ b/plugins/Intl/lang/te.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s నిమి.",
         "NSeconds": "%s సెకన్లు",
         "NSecondsShort": "%sసె",
-        "NumberFormat": "#,##,##0.###",
-        "NumberFormatNegative": "-#,##,##0.###",
+        "NumberFormatNumber": "#,##,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/th.json b/plugins/Intl/lang/th.json
index 68ff72125a..0f827fac72 100644
--- a/plugins/Intl/lang/th.json
+++ b/plugins/Intl/lang/th.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s นาที",
         "NSeconds": "%s วินาที",
         "NSecondsShort": "%sวิ",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/tl.json b/plugins/Intl/lang/tl.json
index 467e9e36e6..71abdf6151 100644
--- a/plugins/Intl/lang/tl.json
+++ b/plugins/Intl/lang/tl.json
@@ -525,8 +525,7 @@
         "NMinutesShort": "%s min.",
         "NSeconds": "%s na segundo",
         "NSecondsShort": "%ss",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/tr.json b/plugins/Intl/lang/tr.json
index 8540c88797..7a0ae90c1c 100644
--- a/plugins/Intl/lang/tr.json
+++ b/plugins/Intl/lang/tr.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s dk.",
         "NSeconds": "%s saniye",
         "NSecondsShort": "%ssn",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "%#,##0",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/uk.json b/plugins/Intl/lang/uk.json
index a0b5df3c27..cdc38219de 100644
--- a/plugins/Intl/lang/uk.json
+++ b/plugins/Intl/lang/uk.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s хв",
         "NSeconds": "%s секунди",
         "NSecondsShort": "%s с",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": " ",
diff --git a/plugins/Intl/lang/vi.json b/plugins/Intl/lang/vi.json
index 2510231ab3..cfaa336635 100644
--- a/plugins/Intl/lang/vi.json
+++ b/plugins/Intl/lang/vi.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s phút",
         "NSeconds": "%s giây",
         "NSecondsShort": "%s giây",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ",",
         "NumberSymbolGroup": ".",
diff --git a/plugins/Intl/lang/zh-cn.json b/plugins/Intl/lang/zh-cn.json
index 414f9c0776..be28705106 100644
--- a/plugins/Intl/lang/zh-cn.json
+++ b/plugins/Intl/lang/zh-cn.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s分钟",
         "NSeconds": "%s秒钟",
         "NSecondsShort": "%s秒",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",
diff --git a/plugins/Intl/lang/zh-tw.json b/plugins/Intl/lang/zh-tw.json
index 3ac8261ab0..7084fe5d59 100644
--- a/plugins/Intl/lang/zh-tw.json
+++ b/plugins/Intl/lang/zh-tw.json
@@ -555,8 +555,7 @@
         "NMinutesShort": "%s 分鐘",
         "NSeconds": "%s 秒",
         "NSecondsShort": "%s秒",
-        "NumberFormat": "#,##0.###",
-        "NumberFormatNegative": "-#,##0.###",
+        "NumberFormatNumber": "#,##0.###",
         "NumberFormatPercent": "#,##0%",
         "NumberSymbolDecimal": ".",
         "NumberSymbolGroup": ",",