Added locale option for intl form types.

Koc · Koc · commit 7d0476b07337 · 2017-07-23T02:57:59.000+03:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -31,6 +31,8 @@ class CountryType extends AbstractType implements ChoiceLoaderInterface
      */
     private $choiceList;
 
+    private $locale;
+
     /**
      * {@inheritdoc}
      */
@@ -44,9 +46,12 @@ public function configureOptions(OptionsResolver $resolver)
                     return null;
                 }
 
+                $this->locale = $options['locale'];
+
                 return $this;
             },
             'choice_translation_domain' => false,
+            'locale' => \Locale::getDefault(),
         ));
     }
 
@@ -75,7 +80,7 @@ public function loadChoiceList($value = null)
             return $this->choiceList;
         }
 
-        return $this->choiceList = new ArrayChoiceList(array_flip(Intl::getRegionBundle()->getCountryNames()), $value);
+        return $this->choiceList = new ArrayChoiceList(array_flip(Intl::getRegionBundle()->getCountryNames($this->locale)), $value);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -56,4 +56,17 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
     {
         parent::testSubmitNull($expected, $norm, '');
     }
+
+    public function testCustomLocale()
+    {
+        $choices = $this->factory->create(static::TESTED_TYPE, null, array('locale' => 'ru'))
+            ->createView()->vars['choices'];
+
+        // Don't check objects for identity
+        $this->assertContains(new ChoiceView('DE', 'DE', 'Германия'), $choices, '', false, false);
+        $this->assertContains(new ChoiceView('GB', 'GB', 'Великобритания'), $choices, '', false, false);
+        $this->assertContains(new ChoiceView('US', 'US', 'Соединенные Штаты'), $choices, '', false, false);
+        $this->assertContains(new ChoiceView('FR', 'FR', 'Франция'), $choices, '', false, false);
+        $this->assertContains(new ChoiceView('MY', 'MY', 'Малайзия'), $choices, '', false, false);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ class CountryType extends AbstractType implements ChoiceLoaderInterface`
`31`	`31`	`*/`
`32`	`32`	`private $choiceList;`
`33`	`33`
	`34`	`+ private $locale;`
	`35`	`+`
`34`	`36`	`/**`
`35`	`37`	`* {@inheritdoc}`
`36`	`38`	`*/`
`@@ -44,9 +46,12 @@ public function configureOptions(OptionsResolver $resolver)`
`44`	`46`	`return null;`
`45`	`47`	`}`
`46`	`48`
	`49`	`+ $this->locale = $options['locale'];`
	`50`	`+`
`47`	`51`	`return $this;`
`48`	`52`	`},`
`49`	`53`	`'choice_translation_domain' => false,`
	`54`	`+ 'locale' => \Locale::getDefault(),`
`50`	`55`	`));`
`51`	`56`	`}`
`52`	`57`
`@@ -75,7 +80,7 @@ public function loadChoiceList($value = null)`
`75`	`80`	`return $this->choiceList;`
`76`	`81`	`}`
`77`	`82`
`78`		`- return $this->choiceList = new ArrayChoiceList(array_flip(Intl::getRegionBundle()->getCountryNames()), $value);`
	`83`	`+ return $this->choiceList = new ArrayChoiceList(array_flip(Intl::getRegionBundle()->getCountryNames($this->locale)), $value);`
`79`	`84`	`}`
`80`	`85`
`81`	`86`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,17 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)`
`56`	`56`	`{`
`57`	`57`	`parent::testSubmitNull($expected, $norm, '');`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ public function testCustomLocale()`
	`61`	`+ {`
	`62`	`+ $choices = $this->factory->create(static::TESTED_TYPE, null, array('locale' => 'ru'))`
	`63`	`+ ->createView()->vars['choices'];`
	`64`	`+`
	`65`	`+ // Don't check objects for identity`
	`66`	`+ $this->assertContains(new ChoiceView('DE', 'DE', 'Германия'), $choices, '', false, false);`
	`67`	`+ $this->assertContains(new ChoiceView('GB', 'GB', 'Великобритания'), $choices, '', false, false);`
	`68`	`+ $this->assertContains(new ChoiceView('US', 'US', 'Соединенные Штаты'), $choices, '', false, false);`
	`69`	`+ $this->assertContains(new ChoiceView('FR', 'FR', 'Франция'), $choices, '', false, false);`
	`70`	`+ $this->assertContains(new ChoiceView('MY', 'MY', 'Малайзия'), $choices, '', false, false);`
	`71`	`+ }`
`59`	`72`	`}`