[HttpRequest] fixes Request::getLanguages() bug #7378
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
| @@ -1309,6 +1309,11 @@ public function getLanguages() | |||
| for ($i = 0, $max = count($codes); $i < $max; $i++) { | |||
| if ($i == 0) { | |||
| $lang = strtolower($codes[0]); | |||
| // First segment of compound language codes | |||
| // is added to supported languages list | |||
| if(!in_array($lang, $this->languages)) { | |||
fabpot
added a commit
that referenced
this pull request
Mar 18, 2013
This PR was squashed before being merged into the 2.1 branch (closes #7378). Commits ------- 17dc2ff [HttpRequest] fixes Request::getLanguages() bug Discussion ---------- [HttpRequest] fixes Request::getLanguages() bug This PR adds to suported languages the first segment of all compouds languages codes. When receiving `Accept-Language: en-us` header, accepted languages will now be `en, en_US`. This should not be a BC break as most browsers already send the long **and** short versions of language codes... but some dont. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6928
| $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages()); | ||
| $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages()); | ||
| $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages()); | ||
| $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages()); |
fabpot
added a commit
that referenced
this pull request
Mar 20, 2013
This PR was merged into the 2.1 branch. Commits ------- c928ddc [HttpFoudantion] fixed Request::getPreferredLanguage() 839c78a Revert "merged branch jfsimon/issue-6928 (PR #7378)" Discussion ---------- [HttpFoundation] fixed Request::getPreferredLanguage() Previous PR #7378 was wrong and adding BC break. Resolution for short languages codes is now done in `Request::getPreferredLanguage()` method. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7378
fabpot
added a commit
that referenced
this pull request
Mar 23, 2013
* 2.1: #7106 - fix for ZTS builds Added '@@' escaping strategy for YamlFileLoader and YamlDumper [Yaml] fixed bugs with folded scalar parsing [Form] made DefaultCsrfProvider using session_status() when available Added unit tests to Dumper Update .travis.yml (closes #7355) [HttpFoudantion] fixed Request::getPreferredLanguage() Revert "merged branch jfsimon/issue-6928 (PR #7378)" Routing issue with installation in a sub-directory ref: #7129 Conflicts: .travis.yml src/Symfony/Bundle/FrameworkBundle/Routing/Router.php src/Symfony/Component/Routing/RouteCollection.php
fabpot
added a commit
that referenced
this pull request
Mar 23, 2013
* 2.2: #7106 - fix for ZTS builds Added '@@' escaping strategy for YamlFileLoader and YamlDumper [Yaml] fixed bugs with folded scalar parsing [Form] made DefaultCsrfProvider using session_status() when available Added unit tests to Dumper Update .travis.yml (closes #7355) [HttpFoudantion] fixed Request::getPreferredLanguage() Revert "merged branch jfsimon/issue-6928 (PR #7378)" Routing issue with installation in a sub-directory ref: #7129
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.
This PR adds to suported languages the first segment of all compouds languages codes.
When receiving
Accept-Language: en-usheader, accepted languages will now been, en_US.This should not be a BC break as most browsers already send the long and short versions of language codes... but some dont.