[Intl] Fix root fallback locale #31411
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ro0NL
commented
May 7, 2019
| } catch (MissingResourceException $e) { | ||
| $displayFormat = $reader->readEntry($tempDir.'/lang', 'root', ['localeDisplayPattern']); | ||
| } | ||
| $displayFormat = $reader->readEntry($tempDir.'/lang', $displayLocale, ['localeDisplayPattern']); |
There was a problem hiding this comment.
defaulting to root during compile makes things like this more straightforward (the timezone generator in master also benefits)
i've verified it causes no side-effects in 4.2 / master 👍
ro0NL
commented
May 7, 2019
| { | ||
| // Apply generic notation using square brackets as described per http://cldr.unicode.org/translation/language-names | ||
| $name = str_replace(['(', ')'], ['[', ']'], $this->languageDataProvider->getName(\Locale::getPrimaryLanguage($locale), $displayLocale)); | ||
| $name = str_replace(['(', ')'], ['[', ']'], $reader->readEntry($tempDir.'/lang', $displayLocale, ['Languages', \Locale::getPrimaryLanguage($locale)])); |
There was a problem hiding this comment.
now uses IntlBundleReader instead of JsonBundleReader ... total compilation time;
3.4
real 1m40.170s
PR
real 0m22.073s
moreover, this allows to keep the generators decoupled
ro0NL
commented
May 7, 2019
|
|
||
| $config->addBundleWriter($jsonDir, new JsonBundleWriter()); | ||
|
|
||
| echo "Starting resource bundle compilation. This may take a while...\n"; | ||
|
|
||
| $filesystem->remove($workingDirs); |
There was a problem hiding this comment.
this is done in each generator already
fabpot
reviewed
May 8, 2019
|
Thank you @ro0NL. |
fabpot
added a commit
that referenced
this pull request
May 8, 2019
This PR was merged into the 3.4 branch. Discussion ---------- [Intl] Fix root fallback locale | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no | Tests pass? | yes (including intl-data group) | Fixed tickets | #... <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | symfony/symfony-docs#... <!-- required for new features --> We should never return "root" as a fallback locale for the "root" locale itself. While at it, i realized the alias meta files are pointless :) 4.2) https://github.com/ro0NL/symfony/commit/b9fc8b785773cc38cef86dd0136046234fd77331 4.3) https://github.com/ro0NL/symfony/commit/922a1eb Commits ------- 11ff24a [Intl] Fix root fallback locale
This was referenced May 8, 2019
nicolas-grekas
added a commit
that referenced
this pull request
May 29, 2019
This PR was merged into the 4.3 branch. Discussion ---------- [Intl][4.3] Cleanup internal api | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #... <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | symfony/symfony-docs#... <!-- required for new features --> Forgotten in #31411 (comment) Commits ------- 6eab5d2 [Intl][4.3] Cleanup internal api
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We should never return "root" as a fallback locale for the "root" locale itself.
While at it, i realized the alias meta files are pointless :)
4.2) https://github.com/ro0NL/symfony/commit/b9fc8b785773cc38cef86dd0136046234fd77331
4.3) https://github.com/ro0NL/symfony/commit/922a1eb