Fixed coding standards & made translatable

symfony-cmf · Apr 20, 2013 · e219bc2 · e219bc2
1 parent 8c3a5f8
commit e219bc2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Form/Type/RouteTypeType.php b/Form/Type/RouteTypeType.php
@@ -1,28 +1,26 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 namespace Symfony\Cmf\Bundle\RoutingExtraBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Locale\Locale;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class RouteTypeType extends AbstractType
 {
     protected $routeTypes;
+    protected $translator;
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        $choices = array();
+        foreach ($this->routeTypes as $routeType) {
+            $choices[$routeType] = 'route_type.'.$routeType;
+        }
+
         $resolver->setDefaults(array(
-            'choices' => $this->routeTypes,
+            'choices' => $choices,
+            'translation_domain' => 'SymfonyCmfRoutingExtraBundle',
         ));
     }
 

diff --git a/Tests/Form/Type/RouteTypeTypeTest.php b/Tests/Form/Type/RouteTypeTypeTest.php
@@ -17,13 +17,15 @@ public function testDefaultsSet()
     {
         $this->type->addRouteType('foobar');
         $this->type->addRouteType('barfoo');
+
         $this->ori->expects($this->once())
             ->method('setDefaults')
             ->with(array(
                 'choices' => array(
-                    'foobar' => 'foobar',
-                    'barfoo' => 'barfoo',
+                    'foobar' => 'route_type.foobar',
+                    'barfoo' => 'route_type.barfoo',
                 ),
+                'translation_domain' => 'SymfonyCmfRoutingExtraBundle',
             ));
 
         $this->type->setDefaultOptions($this->ori);