diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "merged branch jfsimon/issue-6928 (PR #7378)"

Browse Source 
This reverts commit 70ec4f6c61, reversing
changes made to 3a03f3e346.
This commit is contained in:
Jean-François Simon 2013-03-20 14:19:35 +01:00
parent 0631f9edcd
commit 839c78a4b0
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -1309,11 +1309,6 @@ class Request
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)) {
$this->languages[] = $lang;
}
} else {
$lang .= '_'.strtoupper($codes[$i]);
}
@ -1321,9 +1316,7 @@ class Request
}
}
if (!in_array($lang, $this->languages)) {
$this->languages[] = $lang;
}
$this->languages[] = $lang;
}
return $this->languages;

8
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -951,8 +951,8 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
$this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages());
$this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages());
$this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
$this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
$request = new Request();
$request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
@ -969,10 +969,6 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->headers->set('Accept-language', 'zh, i-cherokee; q=0.6');
$this->assertEquals(array('zh', 'cherokee'), $request->getLanguages());
$request = new Request();
$request->headers->set('Accept-language', 'en-us');
$this->assertEquals(array('en', 'en_US'), $request->getLanguages());
}
public function testGetRequestFormat()