Skip to content

[Translation] remove unused code #42128

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

[Translation] remove unused code #42128

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
1 change: 0 additions & 1 deletion src/Symfony/Component/Translation/Tests/TranslatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ public function getInvalidLocalesTests()
public function getValidLocalesTests()
{
return [
[''],
['fr'],
['francais'],
['FR'],
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

@nicolas-grekas nicolas-grekas Jul 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can't deprecate anymore on 4.4
looks like we (I) missed why #38230 was proposed...

}

/**
Expand Down Expand Up @@ -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)) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the empty string should not be a valid locale

throw new InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));
}
}
Expand Down