From f2a0aec49eaeae7e3bfe8d06008b74907443936c Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 15 Mar 2013 16:17:03 +0100 Subject: [PATCH] [Form] Adapted to latest Intl changes --- src/Symfony/Component/Form/Extension/Core/Type/CountryType.php | 2 +- src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php | 2 +- src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php index cbb0c01fe9..c9c979a6e6 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php @@ -24,7 +24,7 @@ class CountryType extends AbstractType public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults(array( - 'choices' => Intl::getRegionBundle()->getCountryNames(\Locale::getDefault()), + 'choices' => Intl::getRegionBundle()->getCountryNames(), )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php index 5c45cffde0..04994a0775 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php @@ -24,7 +24,7 @@ class LanguageType extends AbstractType public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults(array( - 'choices' => Intl::getLanguageBundle()->getLanguageNames(\Locale::getDefault()), + 'choices' => Intl::getLanguageBundle()->getLanguageNames(), )); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php index 43d1c4bbc3..c68c561a2d 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php @@ -24,7 +24,7 @@ class LocaleType extends AbstractType public function setDefaultOptions(OptionsResolverInterface $resolver) { $resolver->setDefaults(array( - 'choices' => Intl::getLocaleBundle()->getLocaleNames(\Locale::getDefault()), + 'choices' => Intl::getLocaleBundle()->getLocaleNames(), )); }