Merge branch 'master' into air.5

3 files changed, 8 insertions, 2 deletions

diff --git a/vendor/commerceguys/intl/scripts/fetch_data.sh b/vendor/commerceguys/intl/scripts/fetch_data.sh
index 804ecc1a1..804ecc1a1 100644..100755
--- a/vendor/commerceguys/intl/scripts/fetch_data.sh
+++ b/vendor/commerceguys/intl/scripts/fetch_data.sh
diff --git a/vendor/commerceguys/intl/scripts/generate_base.php b/vendor/commerceguys/intl/scripts/generate_base.php
index d5e18f2b6..6932b32f4 100644
--- a/vendor/commerceguys/intl/scripts/generate_base.php
+++ b/vendor/commerceguys/intl/scripts/generate_base.php
@@ -35,8 +35,8 @@ if (!function_exists('collator_create')) {
 $ignoredLocales = [
     // Esperanto, Interlingua, Volapuk are made up languages.
     'eo', 'ia', 'vo',
-    // Church Slavic, Manx, Prussian are historical languages.
-    'cu', 'gv', 'prg',
+    // Church Slavic, Manx, Prussian, Sanskrit are historical languages.
+    'cu', 'gv', 'prg', 'sa',
     // Valencian differs from its parent only by a single character (è/é).
     'ca-ES-VALENCIA',
     // Africa secondary languages.
diff --git a/vendor/commerceguys/intl/scripts/generate_number_format_data.php b/vendor/commerceguys/intl/scripts/generate_number_format_data.php
index 0654d0ebb..2a00548cf 100644
--- a/vendor/commerceguys/intl/scripts/generate_number_format_data.php
+++ b/vendor/commerceguys/intl/scripts/generate_number_format_data.php
@@ -106,9 +106,15 @@ function generate_number_formats()
         if ($decimalSeparator != '.') {
             $numberFormats[$locale]['decimal_separator'] = $decimalSeparator;
         }
+        if (array_key_exists('currencyDecimal', $data['symbols-numberSystem-' . $numberingSystem])) {
+            $numberFormats[$locale]['decimal_currency_separator'] = $data['symbols-numberSystem-' . $numberingSystem]['currencyDecimal'];
+        }
         if ($groupingSeparator != ',') {
             $numberFormats[$locale]['grouping_separator'] = $groupingSeparator;
         }
+        if (array_key_exists('currencyGroup', $data['symbols-numberSystem-' . $numberingSystem])) {
+            $numberFormats[$locale]['grouping_currency_separator'] = $data['symbols-numberSystem-' . $numberingSystem]['currencyGroup'];
+        }
         if ($plusSign != '+') {
             $numberFormats[$locale]['plus_sign'] = $plusSign;
         }