From cc85c2f4d7fc0e456cc4d4336abe4ee19d03f312 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 5 Jun 2021 09:11:39 +0000 Subject: composer update commerceguys/intl --- vendor/commerceguys/intl/scripts/fetch_data.sh | 6 ++---- vendor/commerceguys/intl/scripts/generate_base.php | 10 ++++------ vendor/commerceguys/intl/scripts/generate_locale_data.php | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) mode change 100644 => 100755 vendor/commerceguys/intl/scripts/fetch_data.sh (limited to 'vendor/commerceguys/intl/scripts') diff --git a/vendor/commerceguys/intl/scripts/fetch_data.sh b/vendor/commerceguys/intl/scripts/fetch_data.sh old mode 100644 new mode 100755 index 804ecc1a1..1b3a339a5 --- a/vendor/commerceguys/intl/scripts/fetch_data.sh +++ b/vendor/commerceguys/intl/scripts/fetch_data.sh @@ -6,14 +6,12 @@ rm -fR assets mkdir assets cd assets -git clone https://github.com/unicode-cldr/cldr-core.git -git clone https://github.com/unicode-cldr/cldr-numbers-full.git -git clone https://github.com/unicode-cldr/cldr-localenames-full.git +git clone https://github.com/unicode-org/cldr-json.git cldr if command -v wget >/dev/null 2>&1; then wget $URL -O c2.xml -else +else if command -v curl >/dev/null 2>&1; then curl $URL > c2.xml diff --git a/vendor/commerceguys/intl/scripts/generate_base.php b/vendor/commerceguys/intl/scripts/generate_base.php index 6932b32f4..102a2cfae 100644 --- a/vendor/commerceguys/intl/scripts/generate_base.php +++ b/vendor/commerceguys/intl/scripts/generate_base.php @@ -4,12 +4,10 @@ require __DIR__ . '/../vendor/autoload.php'; // Downloaded from http://www.currency-iso.org/en/home/tables/table-a1.html $isoCurrencies = __DIR__ . '/assets/c2.xml'; -// Downloaded from https://github.com/unicode-cldr/cldr-core.git -$currencyData = __DIR__ . '/assets/cldr-core/supplemental/currencyData.json'; -// Downloaded from https://github.com/unicode-cldr/cldr-localenames-full.git -$localeDirectory = __DIR__ . '/assets/cldr-localenames-full/main/'; -// Downloaded from https://github.com/unicode-cldr/cldr-numbers-full.git -$numbersDirectory = __DIR__ . '/assets/cldr-numbers-full/main/'; +// Downloaded from https://github.com/unicode-org/cldr-json.git +$currencyData = __DIR__ . '/assets/cldr/cldr-json/cldr-core/supplemental/currencyData.json'; +$localeDirectory = __DIR__ . '/assets/cldr/cldr-json/cldr-localenames-full/main/'; +$numbersDirectory = __DIR__ . '/assets/cldr/cldr-json/cldr-numbers-full/main/'; // Preflight checks. if (!file_exists($currencyData)) { diff --git a/vendor/commerceguys/intl/scripts/generate_locale_data.php b/vendor/commerceguys/intl/scripts/generate_locale_data.php index d1e77b8d8..67240fd7e 100644 --- a/vendor/commerceguys/intl/scripts/generate_locale_data.php +++ b/vendor/commerceguys/intl/scripts/generate_locale_data.php @@ -6,7 +6,7 @@ require __DIR__ . '/generate_base.php'; -$parentLocales = __DIR__ . '/assets/cldr-core/supplemental/parentLocales.json'; +$parentLocales = __DIR__ . '/assets/cldr/cldr-json/cldr-core/supplemental/parentLocales.json'; $parentLocales = json_decode(file_get_contents($parentLocales), true); $parentLocales = $parentLocales['supplemental']['parentLocales']['parentLocale']; foreach ($parentLocales as $locale => $parentLocale) { -- cgit v1.2.3