Merge branch '1.2'

* 1.2:
  bumped version to 1.2.3-DEV
  prepared the 1.2.2 release
  updated CHANGELOG
  fixed translator
  fixed translator
  Update testing.rst

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php

doc/changelog.rst

@@ -9,9 +9,10 @@ Changelog
 * [BC BREAK] Locale management has been moved to LocaleServiceProvider which must be registered
   if you want Silex to manage your locale (must also be registered for the translation service provider)
 
-1.2.2 (2014-XX-XX)
+1.2.2 (2014-09-26)
 ------------------
 
+* fixed Translator locale management
 * added support for the $app argument in application middlewares (to make it consistent with route middlewares)
 * added form.types to the Form provider
 

doc/testing.rst

@@ -54,7 +54,7 @@ page loaded correctly and contains our form::
 
 Here you see some of the available assertions. There is a full list available
 in the `Writing Tests for PHPUnit
-<http://www.phpunit.de/manual/current/en/writing-tests-for-phpunit.html>`_
+<https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html>`_
 section of the PHPUnit documentation.
 
 WebTestCase

src/Silex/Provider/Translation/Translator.php

@@ -38,6 +38,10 @@ class Translator extends BaseTranslator
 
     public function setLocale($locale)
     {
+        if (null === $locale) {
+            return;
+        }
+
         $this->app['locale'] = $locale;
 
         parent::setLocale($locale);