[Form] Adapted to latest Intl changes

webmozart · webmozart · commit f2a0aec49eae · 2013-04-05T10:11:15.000+02:00
diff --git 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
@@ -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
@@ -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(),
         ));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class CountryType extends AbstractType`
`24`	`24`	`public function setDefaultOptions(OptionsResolverInterface $resolver)`
`25`	`25`	`{`
`26`	`26`	`$resolver->setDefaults(array(`
`27`		`- 'choices' => Intl::getRegionBundle()->getCountryNames(\Locale::getDefault()),`
	`27`	`+ 'choices' => Intl::getRegionBundle()->getCountryNames(),`
`28`	`28`	`));`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class LanguageType extends AbstractType`
`24`	`24`	`public function setDefaultOptions(OptionsResolverInterface $resolver)`
`25`	`25`	`{`
`26`	`26`	`$resolver->setDefaults(array(`
`27`		`- 'choices' => Intl::getLanguageBundle()->getLanguageNames(\Locale::getDefault()),`
	`27`	`+ 'choices' => Intl::getLanguageBundle()->getLanguageNames(),`
`28`	`28`	`));`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class LocaleType extends AbstractType`
`24`	`24`	`public function setDefaultOptions(OptionsResolverInterface $resolver)`
`25`	`25`	`{`
`26`	`26`	`$resolver->setDefaults(array(`
`27`		`- 'choices' => Intl::getLocaleBundle()->getLocaleNames(\Locale::getDefault()),`
	`27`	`+ 'choices' => Intl::getLocaleBundle()->getLocaleNames(),`
`28`	`28`	`));`
`29`	`29`	`}`
`30`	`30`