Merge branch '5.0RC'5.0

1 files changed, 9 insertions, 1 deletions

diff --git a/vendor/commerceguys/intl/scripts/generate_locale_data.php b/vendor/commerceguys/intl/scripts/generate_locale_data.php
index 4e2b617b8..d1e77b8d8 100644
--- a/vendor/commerceguys/intl/scripts/generate_locale_data.php
+++ b/vendor/commerceguys/intl/scripts/generate_locale_data.php
@@ -4,11 +4,19 @@
  * Generates the $parents array for the Locale class.
  */
 
+require __DIR__ . '/generate_base.php';
+
 $parentLocales = __DIR__ . '/assets/cldr-core/supplemental/parentLocales.json';
 $parentLocales = json_decode(file_get_contents($parentLocales), true);
 $parentLocales = $parentLocales['supplemental']['parentLocales']['parentLocale'];
-$parentLocales = var_export($parentLocales, true) . ';';
+foreach ($parentLocales as $locale => $parentLocale) {
+    $localeParts = explode('-', $locale);
+    if (in_array($localeParts[0], $ignoredLocales)) {
+        unset($parentLocales[$locale]);
+    }
+}
 
+$parentLocales = var_export($parentLocales, true) . ';';
 $export = "<?php\n\n";
 $export .= '$parents = ' . str_replace(['array (', ')'], ['[', ']'], $parentLocales);
 $export .= "\n";