Skip to content

[Intl] Backport #28070 #31341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Intl] Backport #28070 #31341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Intl] Backport #28070
  • Loading branch information
@ro0NL
ro0NL committed May 1, 2019
commit 08f6739b923f1e0dc1db17a7925830fe2ec037cd
7 changes: 7 additions & 0 deletions src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public function generateData(GeneratorConfig $config)

$locales = $localeScanner->scanLocales($config->getSourceDir().'/locales');
$aliases = $localeScanner->scanAliases($config->getSourceDir().'/locales');
$parents = $localeScanner->scanParents($config->getSourceDir().'/locales');

// Flip to facilitate lookup
$flippedLocales = array_flip($locales);
Expand Down Expand Up @@ -134,6 +135,12 @@ public function generateData(GeneratorConfig $config)
'Aliases' => $aliases,
]);
}

// Write parents locale file for the Translation component
\file_put_contents(
__DIR__.'/../../../Translation/Resources/data/parents.json',
\json_encode($parents, \JSON_PRETTY_PRINT).\PHP_EOL
);
}

private function generateLocaleName($locale, $displayLocale)
Expand Down
24 changes: 24 additions & 0 deletions src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,28 @@ public function scanAliases($sourceDir)

return $aliases;
}

/**
* Returns all locale parents found in the given directory.
*
* @param string $sourceDir
*
* @return array
*/
public function scanParents($sourceDir)
{
$locales = $this->scanLocales($sourceDir);
$fallbacks = [];

foreach ($locales as $locale) {
$content = \file_get_contents($sourceDir.'/'.$locale.'.txt');

// Aliases contain the text "%%PARENT" followed by the aliased locale
if (\preg_match('/%%Parent{"([^"]+)"}/', $content, $matches)) {
$fallbacks[$locale] = $matches[1];
}
}

return $fallbacks;
}
}
15 changes: 14 additions & 1 deletion src/Symfony/Component/Intl/Tests/Data/Util/LocaleScannerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ protected function setUp()

$this->filesystem->touch($this->directory.'/en.txt');
$this->filesystem->touch($this->directory.'/en_alias.txt');
$this->filesystem->touch($this->directory.'/en_child.txt');
$this->filesystem->touch($this->directory.'/de.txt');
$this->filesystem->touch($this->directory.'/de_alias.txt');
$this->filesystem->touch($this->directory.'/de_child.txt');
$this->filesystem->touch($this->directory.'/fr.txt');
$this->filesystem->touch($this->directory.'/fr_alias.txt');
$this->filesystem->touch($this->directory.'/fr_child.txt');
$this->filesystem->touch($this->directory.'/root.txt');
$this->filesystem->touch($this->directory.'/supplementalData.txt');
$this->filesystem->touch($this->directory.'/supplementaldata.txt');
Expand All @@ -54,6 +57,9 @@ protected function setUp()
file_put_contents($this->directory.'/en_alias.txt', 'en_alias{"%%ALIAS"{"en"}}');
file_put_contents($this->directory.'/de_alias.txt', 'de_alias{"%%ALIAS"{"de"}}');
file_put_contents($this->directory.'/fr_alias.txt', 'fr_alias{"%%ALIAS"{"fr"}}');
file_put_contents($this->directory.'/en_child.txt', 'en_GB{%%Parent{"en"}}');
file_put_contents($this->directory.'/de_child.txt', 'en_GB{%%Parent{"de"}}');
file_put_contents($this->directory.'/fr_child.txt', 'en_GB{%%Parent{"fr"}}');
}

protected function tearDown()
Expand All @@ -63,7 +69,7 @@ protected function tearDown()

public function testScanLocales()
{
$sortedLocales = ['de', 'de_alias', 'en', 'en_alias', 'fr', 'fr_alias'];
$sortedLocales = ['de', 'de_alias', 'de_child', 'en', 'en_alias', 'en_child', 'fr', 'fr_alias', 'fr_child'];

$this->assertSame($sortedLocales, $this->scanner->scanLocales($this->directory));
}
Expand All @@ -74,4 +80,11 @@ public function testScanAliases()

$this->assertSame($sortedAliases, $this->scanner->scanAliases($this->directory));
}

public function testScanParents()
{
$sortedParents = ['de_child' => 'de', 'en_child' => 'en', 'fr_child' => 'fr'];

$this->assertSame($sortedParents, $this->scanner->scanParents($this->directory));
}
}
136 changes: 136 additions & 0 deletions src/Symfony/Component/Translation/Resources/data/parents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"az_Cyrl": "root",
"bs_Cyrl": "root",
"en_150": "en_001",
"en_AG": "en_001",
"en_AI": "en_001",
"en_AT": "en_150",
"en_AU": "en_001",
"en_BB": "en_001",
"en_BE": "en_150",
"en_BM": "en_001",
"en_BS": "en_001",
"en_BW": "en_001",
"en_BZ": "en_001",
"en_CA": "en_001",
"en_CC": "en_001",
"en_CH": "en_150",
"en_CK": "en_001",
"en_CM": "en_001",
"en_CX": "en_001",
"en_CY": "en_001",
"en_DE": "en_150",
"en_DG": "en_001",
"en_DK": "en_150",
"en_DM": "en_001",
"en_ER": "en_001",
"en_FI": "en_150",
"en_FJ": "en_001",
"en_FK": "en_001",
"en_FM": "en_001",
"en_GB": "en_001",
"en_GD": "en_001",
"en_GG": "en_001",
"en_GH": "en_001",
"en_GI": "en_001",
"en_GM": "en_001",
"en_GY": "en_001",
"en_HK": "en_001",
"en_IE": "en_001",
"en_IL": "en_001",
"en_IM": "en_001",
"en_IN": "en_001",
"en_IO": "en_001",
"en_JE": "en_001",
"en_JM": "en_001",
"en_KE": "en_001",
"en_KI": "en_001",
"en_KN": "en_001",
"en_KY": "en_001",
"en_LC": "en_001",
"en_LR": "en_001",
"en_LS": "en_001",
"en_MG": "en_001",
"en_MO": "en_001",
"en_MS": "en_001",
"en_MT": "en_001",
"en_MU": "en_001",
"en_MW": "en_001",
"en_MY": "en_001",
"en_NA": "en_001",
"en_NF": "en_001",
"en_NG": "en_001",
"en_NL": "en_150",
"en_NR": "en_001",
"en_NU": "en_001",
"en_NZ": "en_001",
"en_PG": "en_001",
"en_PH": "en_001",
"en_PK": "en_001",
"en_PN": "en_001",
"en_PW": "en_001",
"en_RW": "en_001",
"en_SB": "en_001",
"en_SC": "en_001",
"en_SD": "en_001",
"en_SE": "en_150",
"en_SG": "en_001",
"en_SH": "en_001",
"en_SI": "en_150",
"en_SL": "en_001",
"en_SS": "en_001",
"en_SX": "en_001",
"en_SZ": "en_001",
"en_TC": "en_001",
"en_TK": "en_001",
"en_TO": "en_001",
"en_TT": "en_001",
"en_TV": "en_001",
"en_TZ": "en_001",
"en_UG": "en_001",
"en_VC": "en_001",
"en_VG": "en_001",
"en_VU": "en_001",
"en_WS": "en_001",
"en_ZA": "en_001",
"en_ZM": "en_001",
"en_ZW": "en_001",
"es_AR": "es_419",
"es_BO": "es_419",
"es_BR": "es_419",
"es_BZ": "es_419",
"es_CL": "es_419",
"es_CO": "es_419",
"es_CR": "es_419",
"es_CU": "es_419",
"es_DO": "es_419",
"es_EC": "es_419",
"es_GT": "es_419",
"es_HN": "es_419",
"es_MX": "es_419",
"es_NI": "es_419",
"es_PA": "es_419",
"es_PE": "es_419",
"es_PR": "es_419",
"es_PY": "es_419",
"es_SV": "es_419",
"es_US": "es_419",
"es_UY": "es_419",
"es_VE": "es_419",
"pa_Arab": "root",
"pt_AO": "pt_PT",
"pt_CH": "pt_PT",
"pt_CV": "pt_PT",
"pt_GQ": "pt_PT",
"pt_GW": "pt_PT",
"pt_LU": "pt_PT",
"pt_MO": "pt_PT",
"pt_MZ": "pt_PT",
"pt_ST": "pt_PT",
"pt_TL": "pt_PT",
"sr_Latn": "root",
"uz_Arab": "root",
"uz_Cyrl": "root",
"zh_Hant": "root",
"zh_Hant_MO": "zh_Hant_HK"
}