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

[Translation] fixed previous merge

Browse Source
This commit is contained in:
Fabien Potencier 2011-09-20 07:50:47 +02:00
parent 01a24db500
commit 774ac80d18
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Symfony/Component/Translation/Translator.php
View File

@ -182,10 +182,6 @@ class Translator implements TranslatorInterface
{
$current = $this->catalogues[$locale];
foreach ($this->computeFallbackLocales($locale) as $fallback) {
if ($fallback === $locale) {
continue;
}
if (!isset($this->catalogues[$fallback])) {
$this->doLoadCatalogue($fallback);
}
@ -197,7 +193,14 @@ class Translator implements TranslatorInterface
private function computeFallbackLocales($locale)
{
$locales = $this->fallbackLocales;
$locales = array();
foreach ($this->fallbackLocales as $fallback) {
if ($fallback === $locale) {
continue;
}
$locales[] = $fallback;
}
if (strlen($locale) > 3) {
array_unshift($locales, substr($locale, 0, -strlen(strrchr($locale, '_'))));