Skip to content

Commit

Permalink
minor #36860 [Intl] bump icu 67.1 (ro0NL)
Browse files Browse the repository at this point in the history 
This PR was squashed before being merged into the 3.4 branch.

Discussion
----------

[Intl] bump icu 67.1

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

mainly some new locales+scripts (see 3a3a9ba)

Commits
-------

29eb271 [Intl] bump icu 67.1
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed May 19, 2020
2 parents 8e428ed + 29eb271 commit 42c7975
Show file tree
Hide file tree
Showing 1,033 changed files with 6,199 additions and 1,286 deletions.
4 changes: 0 additions & 4 deletions src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
View file
Expand Up @@ -82,7 +82,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te

if (isset($localeBundle['Currencies']) && null !== $localeBundle['Currencies']) {
$data = [
'Version' => $localeBundle['Version'],
'Names' => $this->generateSymbolNamePairs($localeBundle),
];

Expand All @@ -102,7 +101,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
$rootBundle = $reader->read($tempDir, 'root');

return [
'Version' => $rootBundle['Version'],
'Names' => $this->generateSymbolNamePairs($rootBundle),
];
}
Expand All @@ -112,7 +110,6 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');
$supplementalDataBundle = $reader->read($tempDir, 'supplementalData');
$numericCodesBundle = $reader->read($tempDir, 'currencyNumericCodes');

Expand All @@ -121,7 +118,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $temp
sort($this->currencyCodes);

$data = [
'Version' => $rootBundle['Version'],
'Currencies' => $this->currencyCodes,
'Meta' => $this->generateCurrencyMeta($supplementalDataBundle),
'Alpha3ToNumeric' => $this->generateAlpha3ToNumericMapping($numericCodesBundle, $this->currencyCodes),
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
View file
Expand Up @@ -126,7 +126,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
// isset() on \ResourceBundle returns true even if the value is null
if (isset($localeBundle['Languages']) && null !== $localeBundle['Languages']) {
$data = [
'Version' => $localeBundle['Version'],
'Names' => iterator_to_array($localeBundle['Languages']),
];

Expand All @@ -150,15 +149,13 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');
$metadataBundle = $reader->read($tempDir, 'metadata');

$this->languageCodes = array_unique($this->languageCodes);

sort($this->languageCodes);

return [
'Version' => $rootBundle['Version'],
'Languages' => $this->languageCodes,
'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
];
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
View file
Expand Up @@ -96,7 +96,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
// isset() on \ResourceBundle returns true even if the value is null
if (isset($localeBundle['Countries']) && null !== $localeBundle['Countries']) {
$data = [
'Version' => $localeBundle['Version'],
'Names' => $this->generateRegionNames($localeBundle),
];

Expand All @@ -120,14 +119,11 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');

$this->regionCodes = array_unique($this->regionCodes);

sort($this->regionCodes);

return [
'Version' => $rootBundle['Version'],
'Regions' => $this->regionCodes,
];
}
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
View file
Expand Up @@ -65,7 +65,6 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
// isset() on \ResourceBundle returns true even if the value is null
if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
$data = [
'Version' => $localeBundle['Version'],
'Names' => iterator_to_array($localeBundle['Scripts']),
];

Expand All @@ -89,14 +88,11 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
*/
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');

$this->scriptCodes = array_unique($this->scriptCodes);

sort($this->scriptCodes);

return [
'Version' => $rootBundle['Version'],
'Scripts' => $this->scriptCodes,
];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Intl/Intl.php
View file
Expand Up @@ -235,7 +235,7 @@ public static function getIcuDataVersion()
*/
public static function getIcuStubVersion()
{
return '66.1';
return '67.1';
}

/**
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/af.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"NAD": [
"$",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ak.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/Intl/Resources/data/currencies/am.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down Expand Up @@ -239,7 +238,7 @@
],
"HRK": [
"HRK",
"HRK"
"የክሮሽያ ኩና"
],
"HTG": [
"HTG",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"DJF": [
"Fdj",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ERN": [
"Nfk",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"KMF": [
"CF",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"SDG": [
"SDG",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"SOS": [
"S",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"GBP": [
"GB£",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/as.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/az.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AZN": [
"₼",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/be.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bg.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bm.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bn.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bo.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"CNY": [
"¥",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"CNY": [
"CN¥",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/br.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bs.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ca.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"FRF": [
"F",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ce.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/cs.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/cy.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/da.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/de.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/de_CH.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BYN": [
"BYN",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/de_LI.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"EUR": [
"EUR",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/de_LU.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"LUF": [
"F",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/dz.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/ee.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/el.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"ADP": [
"ADP",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_001.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BYB": [
"BYB",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_150.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"EUR": [
"€",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_AE.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_AG.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"XCD": [
"$",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_AI.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"XCD": [
"$",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_AU.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"AED": [
"AED",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_BB.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BBD": [
"$",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_BI.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BIF": [
"FBu",
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/currencies/en_BM.json
View file
@@ -1,5 +1,4 @@
{
"Version": "36.1",
"Names": {
"BMD": [
"$",
Expand Down

0 comments on commit 42c7975

Please sign in to comment.