Merge branch '3.4' into 4.3

* 3.4:
  [Form][Validator][Intl] Fix tests
  [Validator] Accept underscores in the URL validator as the URL will resolve correctly
  [Translation] Collect original locale in case of fallback translation
  Fix toolbar load when GET params are present in "_wdt" route

Author: nicolas-grekas

Constraints/UrlValidator.php

@@ -26,7 +26,7 @@ class UrlValidator extends ConstraintValidator
             (%s)://                                 # protocol
             (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)?      # basic auth
             (
-                ([\pL\pN\pS\-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                ([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                                 # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                    # an IP address
                     |                                                 # or

Tests/Constraints/LanguageValidatorTest.php

@@ -73,7 +73,6 @@ public function getValidLanguages()
     {
         return [
             ['en'],
-            ['en_US'],
             ['my'],
         ];
     }

Tests/Constraints/UrlValidatorTest.php

@@ -106,6 +106,8 @@ public function getValidUrls()
             ['http://www.example.museum'],
             ['https://example.com/'],
             ['https://example.com:80/'],
+            ['http://examp_le.com'],
+            ['http://www.sub_domain.examp_le.com'],
             ['http://www.example.coop/'],
             ['http://www.test-example.com/'],
             ['http://www.symfony.com/'],
@@ -239,7 +241,6 @@ public function getInvalidUrls()
             ['://example.com'],
             ['http ://example.com'],
             ['http:/example.com'],
-            ['http://examp_le.com'],
             ['http://example.com::aa'],
             ['http://example.com:aa'],
             ['ftp://example.fr'],