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

merged branch stealth35/patch-18 (PR #3542)

Browse Source 
Commits
-------

7aad478 [Locale] Prevent empty bundle

Discussion
----------

[Locale] Prevent empty bundle

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/stealth35/symfony.png?branch=patch-18)](http://travis-ci.org/stealth35/symfony)
Fixes the following tickets: #3486
Todo: -
This commit is contained in:
Fabien Potencier 2012-03-10 16:38:15 +01:00
commit 85000fc288
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Locale/Locale.php
View File

@ -51,8 +51,9 @@ class Locale extends \Locale
$collator = new \Collator($locale);
$countries = array();
$bundleCountries = $bundle->get('Countries') ?: array();
foreach ($bundle->get('Countries') as $code => $name) {
foreach ($bundleCountries as $code => $name) {
// Global countries (f.i. "America") have numeric codes
// Countries have alphabetic codes
// "ZZ" is the code for unknown country
@ -105,8 +106,9 @@ class Locale extends \Locale
$collator = new \Collator($locale);
$languages = array();
$bundleLanguages = $bundle->get('Languages') ?: array();
foreach ($bundle->get('Languages') as $code => $name) {
foreach ($bundleLanguages as $code => $name) {
// "mul" is the code for multiple languages
if ('mul' !== $code) {
$languages[$code] = $name;
@ -155,8 +157,9 @@ class Locale extends \Locale
$collator = new \Collator($locale);
$locales = array();
$bundleLocales = $bundle->get('Locales') ?: array();
foreach ($bundle->get('Locales') as $code => $name) {
foreach ($bundleLocales as $code => $name) {
$locales[$code] = $name;
}