Fix Templating in Symfony ~2.6

Warxcell · Aug 1, 2017 · de5226d · de5226d
1 parent 4d14025
commit de5226d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/src/Form/Type/TranslatedEntityType.php b/src/Form/Type/TranslatedEntityType.php
@@ -2,11 +2,11 @@
 
 namespace ObjectBG\TranslationBundle\Form\Type;
 
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 
 /**
  * Translated entity
@@ -40,7 +40,8 @@ public function configureOptions(OptionsResolver $resolver)
                         throw new \Exception('Error while getting request');
                     }
 
-                    return $options['translation_path'] . '[' . $this->request->getLocale() . '].' . $options['translation_property'];
+                    return $options['translation_path'].'['.$this->request->getLocale(
+                        ).'].'.$options['translation_property'];
                 },
             )
         );
@@ -51,4 +52,8 @@ public function getParent()
         return EntityType::class;
     }
 
+    public function getBlockPrefix()
+    {
+        return 'object_bg_translated_entity';
+    }
 }
diff --git a/src/Form/Type/TranslationsFieldsType.php b/src/Form/Type/TranslationsFieldsType.php
@@ -37,5 +37,8 @@ public function configureOptions(OptionsResolver $resolver)
         );
     }
 
-
+    public function getBlockPrefix()
+    {
+        return 'object_bg_translation_fields';
+    }
 }
diff --git a/src/Form/Type/TranslationsFormsType.php b/src/Form/Type/TranslationsFormsType.php
@@ -95,4 +95,8 @@ public function configureOptions(OptionsResolver $resolver)
         );
     }
 
+    public function getBlockPrefix()
+    {
+        return 'object_bg_translations_forms';
+    }
 }
diff --git a/src/Form/Type/TranslationsLocalesSelectorType.php b/src/Form/Type/TranslationsLocalesSelectorType.php
@@ -44,7 +44,11 @@ public function configureOptions(OptionsResolver $resolver)
 
     public function getParent()
     {
-       return \Symfony\Component\Form\Extension\Core\Type\ChoiceType::class;
+        return \Symfony\Component\Form\Extension\Core\Type\ChoiceType::class;
     }
 
+    public function getBlockPrefix()
+    {
+        return 'object_bg_locales_selector';
+    }
 }
diff --git a/src/Form/Type/TranslationsType.php b/src/Form/Type/TranslationsType.php
@@ -71,4 +71,8 @@ public function configureOptions(OptionsResolver $resolver)
         );
     }
 
+    public function getBlockPrefix()
+    {
+        return 'object_bg_translations';
+    }
 }
diff --git a/src/TranslationService.php b/src/TranslationService.php
@@ -132,7 +132,7 @@ public function getLocales()
     {
         $locales = array();
         foreach ($this->getLanguages() as $lang) {
-            $locales[$lang->getLocale()] = $lang->getName();
+            $locales[$lang->getLocale()] = $lang->getName().'('.$lang->getLocale().')';
         }
 
         return $locales;
@@ -298,7 +298,7 @@ private function getFieldsList($options, $class)
             // Check existing
             foreach ($formFields as $field) {
                 if (!property_exists($class, $field)) {
-                    throw new \Exception("Field '" . $field . "' doesn't exist in " . $class);
+                    throw new \Exception("Field '".$field."' doesn't exist in ".$class);
                 }
             }