Update default translations path

symfony · Nov 21, 2017 · ba3476c · ba3476c
1 parent b40c84d
commit ba3476c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -679,7 +679,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                         ->scalarNode('formatter')->defaultValue('translator.formatter.default')->end()
                         ->scalarNode('default_path')
                             ->info('The default path used to load translations')
-                            ->defaultValue('%kernel.project_dir%/config/translations')
+                            ->defaultValue('%kernel.project_dir%/translations')
                         ->end()
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -257,7 +257,7 @@ protected static function getBundleDefaultConfig()
                 'logging' => true,
                 'formatter' => 'translator.formatter.default',
                 'paths' => array(),
-                'default_path' => '%kernel.project_dir%/config/translations',
+                'default_path' => '%kernel.project_dir%/translations',
             ),
             'validation' => array(
                 'enabled' => !class_exists(FullStack::class),

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -42,7 +42,7 @@ framework:
     translator:
         enabled:  true
         fallback: fr
-        default_path: '%kernel.root_dir%/config/translations'
+        default_path: '%kernel.root_dir%/translations'
         paths: ['%kernel.root_dir%/Fixtures/translations']
     validation:
         enabled: true

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -503,7 +503,7 @@ public function testTranslator()
             '->registerTranslatorConfiguration() finds translation resources in custom paths'
         );
         $this->assertContains(
-            strtr(__DIR__.'/config/translations/test_default.en.xlf', '/', DIRECTORY_SEPARATOR),
+            strtr(__DIR__.'/translations/test_default.en.xlf', '/', DIRECTORY_SEPARATOR),
             $files,
             '->registerTranslatorConfiguration() finds translation resources in default path'
         );

diff --git a/...n/config/translations/test_default.en.xlf → ...njection/translations/test_default.en.xlf b/...n/config/translations/test_default.en.xlf → ...njection/translations/test_default.en.xlf