[Translation] Add resources from fallback locale to parent catalogue #17596
Conversation
This file contains 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
c960657
force-pushed
the
translator-fallback-resources
branch
from
41990b0
to
f7f82fa
Compare
| // force catalogue loading | ||
| $this->assertEquals('bar', $translator->trans('foo', array())); | ||
|
|
||
| $cataloguesProperty = new \ReflectionProperty($translator, 'catalogues'); |
There was a problem hiding this comment.
you can get catalogue from the translator without using reflection, $translator->getCatalogue('en')
|
Thank you @c960657. |
fabpot
added a commit
that referenced
this pull request
Jan 31, 2016
… catalogue (c960657) This PR was merged into the 2.3 branch. Discussion ---------- [Translation] Add resources from fallback locale to parent catalogue | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - The resources representing a locale includes those of the fallback locale. However, `getCatalogue()->getResources()` only returns the resources belonging specifically to the selected locale. Example: The locale `en_GB` falls back to `en`. I use the locale `en_GB`. During development, when I modify the `en_GB` translation file, the changes appear instantly when reloading the page. If I modify the `en` translation file, I need to manually clear the cache in order for the new translation to appear. I believe this is a regression that was introduced in #15527. This patch is for the 2.3 branch. For 2.6 and later, the test can be updated to use the getCatalogue() method instead of using ReflectionProperty. Commits ------- f7f82fa [Translation] Add resources from fallback locale
Merged
This was referenced Feb 28, 2016
Merged
Merged
Merged
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.
The resources representing a locale includes those of the fallback locale. However,
getCatalogue()->getResources()only returns the resources belonging specifically to the selected locale.Example: The locale
en_GBfalls back toen. I use the localeen_GB. During development, when I modify theen_GBtranslation file, the changes appear instantly when reloading the page. If I modify theentranslation file, I need to manually clear the cache in order for the new translation to appear.I believe this is a regression that was introduced in #15527.
This patch is for the 2.3 branch. For 2.6 and later, the test can be updated to use the getCatalogue() method instead of using ReflectionProperty.