Improvements

javiereguiluz · javiereguiluz · commit 2763dc16bb7a · 2019-10-03T15:30:31.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -767,7 +767,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                             ->prototype('scalar')->end()
                         ->end()
                         ->variableNode('enabled_locales')
-                            ->defaultNull()
+                            ->defaultValue('%kernel.default_locale%')
                             ->beforeNormalization()->ifString()->castToArray()->end()
                         ->end()
                     ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1232,10 +1232,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             $translator->replaceArgument(4, $options);
         }
 
-        // Process and register the enabled locales
-        if (null === $config['enabled_locales'] && null !== $defaultLocale = $container->getParameter('kernel.default_locale')) {
-            $config['enabled_locales'] = [$defaultLocale];
-        }
+        // Register the enabled locales
         $container->setParameter('translation.enabled_locales', $config['enabled_locales']);
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -102,7 +102,7 @@ public function warmUp($cacheDir)
         }
 
         $locales = array_merge($this->getFallbackLocales(), [$this->getLocale()], $this->resourceLocales);
-        $localesToWarmUp = $this->enabledLocales ?? $locales;
+        $localesToWarmUp = array_unique($this->enabledLocales ?? $locales);
         foreach ($localesToWarmUp as $locale) {
             // reset catalogue in case it's already loaded during the dump of the other locales.
             if (isset($this->catalogues[$locale])) {

Original file line number	Diff line number	Diff line change
`@@ -1232,10 +1232,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`1232`	`1232`	`$translator->replaceArgument(4, $options);`
`1233`	`1233`	`}`
`1234`	`1234`
`1235`		`- // Process and register the enabled locales`
`1236`		`- if (null === $config['enabled_locales'] && null !== $defaultLocale = $container->getParameter('kernel.default_locale')) {`
`1237`		`- $config['enabled_locales'] = [$defaultLocale];`
`1238`		`- }`
	`1235`	`+ // Register the enabled locales`
`1239`	`1236`	`$container->setParameter('translation.enabled_locales', $config['enabled_locales']);`
`1240`	`1237`	`}`
`1241`	`1238`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function warmUp($cacheDir)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`$locales = array_merge($this->getFallbackLocales(), [$this->getLocale()], $this->resourceLocales);`
`105`		`- $localesToWarmUp = $this->enabledLocales ?? $locales;`
	`105`	`+ $localesToWarmUp = array_unique($this->enabledLocales ?? $locales);`
`106`	`106`	`foreach ($localesToWarmUp as $locale) {`
`107`	`107`	`// reset catalogue in case it's already loaded during the dump of the other locales.`
`108`	`108`	`if (isset($this->catalogues[$locale])) {`