[Translation] remove unused code #42128
Closed
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
Member
nicolas-grekas
commented
Jul 15, 2021
| Q | A |
|---|---|
| Branch? | 5.2 |
| Bug fix? | no |
| New feature? | no |
| Deprecations? | no |
| Tickets | - |
| License | MIT |
| Doc PR | - |
c781a0e to
5c5d50d
Compare
derrabus
approved these changes
Jul 15, 2021
nicolas-grekas
commented
Jul 15, 2021
| @@ -150,7 +150,7 @@ public function addResource(string $format, $resource, string $locale, string $d | |||
| public function setLocale(string $locale) | |||
| { | |||
| $this->assertValidLocale($locale); | |||
| $this->locale = $locale ?? (class_exists(\Locale::class) ? \Locale::getDefault() : 'en'); | |||
| $this->locale = $locale; | |||
There was a problem hiding this comment.
in 4.4, we deprecated calling setLocale with null
we could make the empty string fallback to \Locale::getDefault(), but there are tests that fail if we do.
There was a problem hiding this comment.
ref #38230
we could still deprecate empty string on 4.4 isnt it? also the trait currenly stll allows "" and "0", perhaps we should consider a shared LocaleAwareTrait
There was a problem hiding this comment.
we can't deprecate anymore on 4.4
looks like we (I) missed why #38230 was proposed...
| @@ -444,7 +444,7 @@ protected function computeFallbackLocales(string $locale) | |||
| */ | |||
| protected function assertValidLocale(string $locale) | |||
| { | |||
| if (null !== $locale && 1 !== preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) { | |||
| if (!preg_match('/^[a-z0-9@_\\.\\-]+$/i', $locale)) { | |||
There was a problem hiding this comment.
the empty string should not be a valid locale
|
Replaced by #42130 |
fabpot
added a commit
that referenced
this pull request
Jul 20, 2021
…s-grekas) This PR was merged into the 4.4 branch. Discussion ---------- [Translation] fix fallback to Locale::getDefault() | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Replaces #42128 and #38230 Provides consistent behavior with `TranslatorTrait::getLocale()`. Commits ------- 20120a3 [Translator] fix fallback to Locale::getDefault()
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.