Skip to content

Commit dcc72f1

Browse files
Merge branch '4.4'
* 4.4: cs fix Partially Revert "Remove trailing space in all markdown files" [Intl] Explicit check Fix getMaxFilesize() returning zero Remove unused import [DI] fix docblocks in Container* Fixed markdown file [HttpFoundation] Fix deprecation message in ::isMethodSafe() [TwigBridge] Replaced plain doc block copies with inheritdoc. [DomCrawler] Fixed CHANGELOG markup [Intl] Cleanup unused language aliases entry
2 parents d6349de + 152738b commit dcc72f1

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Data/Generator/LanguageDataGenerator.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
169169
return [
170170
'Version' => $rootBundle['Version'],
171171
'Languages' => $this->languageCodes,
172-
'Aliases' => array_column(iterator_to_array($metadataBundle['alias']['language']), 'replacement'),
173172
'Alpha2ToAlpha3' => $alpha2ToAlpha3,
174173
'Alpha3ToAlpha2' => $alpha3ToAlpha2,
175174
];
@@ -185,9 +184,9 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
185184
$aliases = iterator_to_array($metadataBundle['alias']['language']);
186185
$alpha2ToAlpha3 = [];
187186

188-
foreach ($aliases as $alias => $language) {
189-
$language = $language['replacement'];
190-
if (2 === \strlen($language) && 3 === \strlen($alias)) {
187+
foreach ($aliases as $alias => $data) {
188+
$language = $data['replacement'];
189+
if (2 === \strlen($language) && 3 === \strlen($alias) && 'overlong' === $data['reason']) {
191190
if (isset(self::$preferredAlpha2ToAlpha3Mapping[$language])) {
192191
// Validate to prevent typos
193192
if (!isset($aliases[self::$preferredAlpha2ToAlpha3Mapping[$language]])) {

Resources/data/languages/meta.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,6 @@
618618
"zun",
619619
"zza"
620620
],
621-
"Aliases": [],
622621
"Alpha2ToAlpha3": {
623622
"aa": "aar",
624623
"ab": "abk",

0 commit comments

Comments
 (0)