made form and validator translations aware of the current locale

doc/changelog.rst

 Changelog
 =========
 
+* **2012-06-16**: renamed ``request.default_locale`` to ``locale``
+
 * **2012-06-16**: Removed the ``translator.loader`` service. See documentation
   for how to use XLIFF or YAML-based translation files.
 

src/Silex/Application.php

@@ -85,7 +85,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
                 return $app['url_matcher'];
             });
             $dispatcher->addSubscriber(new RouterListener($urlMatcher, $app['logger']));
-            $dispatcher->addSubscriber(new LocaleListener($app['request.default_locale'], $urlMatcher));
+            $dispatcher->addSubscriber(new LocaleListener($app['locale'], $urlMatcher));
 
             return $dispatcher;
         });
@@ -147,8 +147,6 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
             }
         });
 
-        $this['request.default_locale'] = 'en';
-
         $this['request_error'] = $this->protect(function () {
             throw new \RuntimeException('Accessed request service outside of request scope. Try moving that call to a before handler or controller.');
         });
@@ -159,6 +157,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
         $this['request.https_port'] = 443;
         $this['debug'] = false;
         $this['charset'] = 'UTF-8';
+        $this['locale'] = 'en';
     }
 
     /**
@@ -537,6 +536,8 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
+        $this['locale'] = $event->getRequest()->getLocale();
+
         if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
             $this->beforeDispatched = true;
             $this['dispatcher']->dispatch(SilexEvents::BEFORE, $event);

src/Silex/Provider/FormServiceProvider.php

@@ -42,7 +42,7 @@ class FormServiceProvider implements ServiceProviderInterface
 
                 if (isset($app['translator'])) {
                     $r = new \ReflectionClass('Symfony\Component\Form\Form');
-                    $app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.en.xlf', 'en', 'validators');
+                    $app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.'.$app['locale'].'.xlf', $app['locale'], 'validators');
                 }
             }
 

src/Silex/Provider/TranslationServiceProvider.php

@@ -28,8 +28,6 @@ class TranslationServiceProvider implements ServiceProviderInterface
 {
     public function register(Application $app)
     {
-        $app['locale'] = 'en';
-
         $app['translator'] = $app->share(function () use ($app) {
             $translator = new Translator($app['locale'], $app['translator.message_selector']);
 

src/Silex/Provider/ValidatorServiceProvider.php

@@ -31,7 +31,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface
         $app['validator'] = $app->share(function () use ($app) {
             if (isset($app['translator'])) {
                 $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
-                $app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.en.xlf', 'en', 'validators');
+                $app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.'.$app['locale'].'.xlf', $app['locale'], 'validators');
             }
 
             return new Validator(