From b5c848978ce5afa866afdc35c8fb86e67816836b Mon Sep 17 00:00:00 2001 From: Oleg Andreyev Date: Tue, 11 Jul 2023 23:13:15 +0300 Subject: [PATCH] update Intl component to take into account B-variant when converting Alpha3 to Alpha2. fixing issue with Darwin. --- .../Data/Generator/LanguageDataGenerator.php | 2 +- .../Intl/Resources/bin/update-data.php | 6 ++++- .../Intl/Resources/data/languages/meta.php | 20 +++++++++++++++++ .../Component/Intl/Tests/LanguagesTest.php | 22 ++++++++++++++++++- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php index 2e85907792d76..84991554d83d9 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php @@ -243,7 +243,7 @@ private function generateAlpha3ToAlpha2Mapping(ArrayAccessibleResourceBundle $me foreach ($metadataBundle['alias']['language'] as $alias => $data) { $language = $data['replacement']; - if (2 === \strlen($language) && 3 === \strlen($alias) && 'overlong' === $data['reason']) { + if (2 === \strlen($language) && 3 === \strlen($alias) && \in_array($data['reason'], ['overlong', 'bibliographic'], true)) { $alpha3ToAlpha2[$alias] = $language; } } diff --git a/src/Symfony/Component/Intl/Resources/bin/update-data.php b/src/Symfony/Component/Intl/Resources/bin/update-data.php index 2aeb141d2cc26..1b2e5c2efffc1 100644 --- a/src/Symfony/Component/Intl/Resources/bin/update-data.php +++ b/src/Symfony/Component/Intl/Resources/bin/update-data.php @@ -160,7 +160,11 @@ } $genrb = $buildDir.'/bin/genrb'; -$genrbEnv = 'LD_LIBRARY_PATH='.$buildDir.'/lib '; +if (\PHP_OS === 'Darwin') { + $genrbEnv = 'DYLD_LIBRARY_PATH='.$buildDir.'/lib '; +} else { + $genrbEnv = 'LD_LIBRARY_PATH='.$buildDir.'/lib '; +} echo "Using $genrb.\n"; diff --git a/src/Symfony/Component/Intl/Resources/data/languages/meta.php b/src/Symfony/Component/Intl/Resources/data/languages/meta.php index 79c5e5c24cbbe..445c5e597e3e1 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/meta.php +++ b/src/Symfony/Component/Intl/Resources/data/languages/meta.php @@ -1483,6 +1483,7 @@ 'bam' => 'bm', 'ben' => 'bn', 'bod' => 'bo', + 'tib' => 'bo', 'bre' => 'br', 'bos' => 'bs', 'cat' => 'ca', @@ -1491,26 +1492,33 @@ 'cos' => 'co', 'cre' => 'cr', 'ces' => 'cs', + 'cze' => 'cs', 'chu' => 'cu', 'chv' => 'cv', 'cym' => 'cy', + 'wel' => 'cy', 'dan' => 'da', 'deu' => 'de', + 'ger' => 'de', 'div' => 'dv', 'dzo' => 'dz', 'ewe' => 'ee', 'ell' => 'el', + 'gre' => 'el', 'eng' => 'en', 'epo' => 'eo', 'spa' => 'es', 'est' => 'et', + 'baq' => 'eu', 'eus' => 'eu', 'fas' => 'fa', + 'per' => 'fa', 'ful' => 'ff', 'fin' => 'fi', 'fij' => 'fj', 'fao' => 'fo', 'fra' => 'fr', + 'fre' => 'fr', 'fry' => 'fy', 'gle' => 'ga', 'gla' => 'gd', @@ -1525,6 +1533,7 @@ 'hrv' => 'hr', 'hat' => 'ht', 'hun' => 'hu', + 'arm' => 'hy', 'hye' => 'hy', 'her' => 'hz', 'ina' => 'ia', @@ -1534,11 +1543,13 @@ 'iii' => 'ii', 'ipk' => 'ik', 'ido' => 'io', + 'ice' => 'is', 'isl' => 'is', 'ita' => 'it', 'iku' => 'iu', 'jpn' => 'ja', 'jav' => 'jv', + 'geo' => 'ka', 'kat' => 'ka', 'kon' => 'kg', 'kik' => 'ki', @@ -1565,19 +1576,24 @@ 'lav' => 'lv', 'mlg' => 'mg', 'mah' => 'mh', + 'mao' => 'mi', 'mri' => 'mi', + 'mac' => 'mk', 'mkd' => 'mk', 'mal' => 'ml', 'mon' => 'mn', 'mar' => 'mr', + 'may' => 'ms', 'msa' => 'ms', 'mlt' => 'mt', + 'bur' => 'my', 'mya' => 'my', 'nau' => 'na', 'nob' => 'nb', 'nde' => 'nd', 'nep' => 'ne', 'ndo' => 'ng', + 'dut' => 'nl', 'nld' => 'nl', 'nno' => 'nn', 'nor' => 'no', @@ -1599,6 +1615,7 @@ 'run' => 'rn', 'mol' => 'ro', 'ron' => 'ro', + 'rum' => 'ro', 'rus' => 'ru', 'kin' => 'rw', 'san' => 'sa', @@ -1608,10 +1625,12 @@ 'sag' => 'sg', 'sin' => 'si', 'slk' => 'sk', + 'slo' => 'sk', 'slv' => 'sl', 'smo' => 'sm', 'sna' => 'sn', 'som' => 'so', + 'alb' => 'sq', 'sqi' => 'sq', 'srp' => 'sr', 'ssw' => 'ss', @@ -1644,6 +1663,7 @@ 'yid' => 'yi', 'yor' => 'yo', 'zha' => 'za', + 'chi' => 'zh', 'zho' => 'zh', 'zul' => 'zu', ], diff --git a/src/Symfony/Component/Intl/Tests/LanguagesTest.php b/src/Symfony/Component/Intl/Tests/LanguagesTest.php index 405e147ecdcab..d53888f2ec859 100644 --- a/src/Symfony/Component/Intl/Tests/LanguagesTest.php +++ b/src/Symfony/Component/Intl/Tests/LanguagesTest.php @@ -1506,6 +1506,7 @@ class LanguagesTest extends ResourceBundleTestCase 'bam' => 'bm', 'ben' => 'bn', 'bod' => 'bo', + 'tib' => 'bo', 'bre' => 'br', 'bos' => 'bs', 'cat' => 'ca', @@ -1514,26 +1515,33 @@ class LanguagesTest extends ResourceBundleTestCase 'cos' => 'co', 'cre' => 'cr', 'ces' => 'cs', + 'cze' => 'cs', 'chu' => 'cu', 'chv' => 'cv', 'cym' => 'cy', + 'wel' => 'cy', 'dan' => 'da', 'deu' => 'de', + 'ger' => 'de', 'div' => 'dv', 'dzo' => 'dz', 'ewe' => 'ee', 'ell' => 'el', + 'gre' => 'el', 'eng' => 'en', 'epo' => 'eo', 'spa' => 'es', 'est' => 'et', + 'baq' => 'eu', 'eus' => 'eu', 'fas' => 'fa', + 'per' => 'fa', 'ful' => 'ff', 'fin' => 'fi', 'fij' => 'fj', 'fao' => 'fo', 'fra' => 'fr', + 'fre' => 'fr', 'fry' => 'fy', 'gle' => 'ga', 'gla' => 'gd', @@ -1548,6 +1556,7 @@ class LanguagesTest extends ResourceBundleTestCase 'hrv' => 'hr', 'hat' => 'ht', 'hun' => 'hu', + 'arm' => 'hy', 'hye' => 'hy', 'her' => 'hz', 'ina' => 'ia', @@ -1557,11 +1566,13 @@ class LanguagesTest extends ResourceBundleTestCase 'iii' => 'ii', 'ipk' => 'ik', 'ido' => 'io', + 'ice' => 'is', 'isl' => 'is', 'ita' => 'it', 'iku' => 'iu', 'jpn' => 'ja', 'jav' => 'jv', + 'geo' => 'ka', 'kat' => 'ka', 'kon' => 'kg', 'kik' => 'ki', @@ -1588,22 +1599,27 @@ class LanguagesTest extends ResourceBundleTestCase 'lav' => 'lv', 'mlg' => 'mg', 'mah' => 'mh', + 'mao' => 'mi', 'mri' => 'mi', + 'mac' => 'mk', 'mkd' => 'mk', 'mal' => 'ml', 'mon' => 'mn', 'mar' => 'mr', + 'may' => 'ms', 'msa' => 'ms', 'mlt' => 'mt', + 'bur' => 'my', 'mya' => 'my', 'nau' => 'na', 'nob' => 'nb', - 'nor' => 'no', 'nde' => 'nd', 'nep' => 'ne', 'ndo' => 'ng', + 'dut' => 'nl', 'nld' => 'nl', 'nno' => 'nn', + 'nor' => 'no', 'nbl' => 'nr', 'nav' => 'nv', 'nya' => 'ny', @@ -1622,6 +1638,7 @@ class LanguagesTest extends ResourceBundleTestCase 'run' => 'rn', 'mol' => 'ro', 'ron' => 'ro', + 'rum' => 'ro', 'rus' => 'ru', 'kin' => 'rw', 'san' => 'sa', @@ -1631,10 +1648,12 @@ class LanguagesTest extends ResourceBundleTestCase 'sag' => 'sg', 'sin' => 'si', 'slk' => 'sk', + 'slo' => 'sk', 'slv' => 'sl', 'smo' => 'sm', 'sna' => 'sn', 'som' => 'so', + 'alb' => 'sq', 'sqi' => 'sq', 'srp' => 'sr', 'ssw' => 'ss', @@ -1667,6 +1686,7 @@ class LanguagesTest extends ResourceBundleTestCase 'yid' => 'yi', 'yor' => 'yo', 'zha' => 'za', + 'chi' => 'zh', 'zho' => 'zh', 'zul' => 'zu', ];