From a2b116618c8e3d3ea1be6d2046a3da4f716f92aa Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 21 Feb 2014 15:31:57 +0100
Subject: [PATCH] load translations in form validator

---
 core/lib/Thelia/Form/BaseForm.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Form/BaseForm.php b/core/lib/Thelia/Form/BaseForm.php
index f15dd7525..137513261 100644
--- a/core/lib/Thelia/Form/BaseForm.php
+++ b/core/lib/Thelia/Form/BaseForm.php
@@ -29,6 +29,7 @@ use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
 use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
 use Symfony\Component\Form\Extension\Csrf\CsrfProvider\SessionCsrfProvider;
 use Symfony\Component\Validator\Validation;
+use Thelia\Core\Translation\Translator;
 use Thelia\Model\ConfigQuery;
 use Thelia\Tools\URL;
 
@@ -70,8 +71,9 @@ abstract class BaseForm
     public function __construct(Request $request, $type= "form", $data = array(), $options = array())
     {
         $this->request = $request;
+        $lang = $request->getSession()->getLang();
 
-        $validator = Validation::createValidator();
+        $validator = Validation::createValidatorBuilder();
 
         if (!isset($options["attr"]["name"])) {
             $options["attr"]["thelia_name"] = $this->getName();
@@ -89,8 +91,33 @@ abstract class BaseForm
                 )
             );
         }
+
+        $translator = Translator::getInstance();
+
+        $vendorDir = THELIA_ROOT . "/core/vendor";
+        $vendorFormDir = $vendorDir . '/symfony/form/Symfony/Component/Form';
+        $vendorValidatorDir =
+            $vendorDir . '/symfony/validator/Symfony/Component/Validator';
+
+        $translator->addResource(
+            'xlf',
+            sprintf($vendorFormDir . '/Resources/translations/validators.%s.xlf', $lang->getCode()),
+            $lang->getLocale(),
+            'validators'
+        );
+        $translator->addResource(
+            'xlf',
+            sprintf($vendorValidatorDir . '/Resources/translations/validators.%s.xlf', $lang->getCode()),
+            $lang->getLocale(),
+            'validators'
+        );
+
+
+        $validator
+            ->setTranslationDomain('validators')
+            ->setTranslator($translator);
         $this->formBuilder = $builder
-            ->addExtension(new ValidatorExtension($validator))
+            ->addExtension(new ValidatorExtension($validator->getValidator()))
             ->getFormFactory()
             ->createNamedBuilder($this->getName(), $type, $data, $this->cleanOptions($options));
         ;