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

bug #9461 set mergeFallback to true, (ychadwick)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

set mergeFallback to true,

If your default locale is de_CH for example, then you get an incomplete list of locales. This issue has been resolved in the LanguageBundle and RegionBundle but not in for the LocaleBundle. Would be also a good idea for the CurrencyBundle

Commits
-------

4587d4e set mergeFallback to true, otherwise an uncomplete list is shown with default locale is for example de_CH
This commit is contained in:
Fabien Potencier 2013-11-09 12:39:25 +01:00
commit d30ffe6d2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
View File

@ -27,7 +27,7 @@ class LocaleBundle extends AbstractBundle implements LocaleBundleInterface
$locale = \Locale::getDefault();
}
return $this->readEntry($locale, array('Locales', $ofLocale));
return $this->readEntry($locale, array('Locales', $ofLocale), true);
}
/**
@ -39,7 +39,7 @@ class LocaleBundle extends AbstractBundle implements LocaleBundleInterface
$locale = \Locale::getDefault();
}
if (null === ($locales = $this->readEntry($locale, array('Locales')))) {
if (null === ($locales = $this->readEntry($locale, array('Locales'), true))) {
return array();
}