From ba3476c8871b67d1ba264c0c2e91fedfeaadf402 Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Tue, 21 Nov 2017 09:08:09 -0500 Subject: [PATCH] Update default translations path --- .../FrameworkBundle/DependencyInjection/Configuration.php | 2 +- .../Tests/DependencyInjection/ConfigurationTest.php | 2 +- .../Tests/DependencyInjection/Fixtures/yml/full.yml | 2 +- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +- .../{config => }/translations/test_default.en.xlf | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/{config => }/translations/test_default.en.xlf (100%) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index cba3f2db01118..d5030fc9fe7cf 100644 --- 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 index f86951e04837c..085911b72abf6 100644 --- 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 index 2c5bbae850e9a..116062e1369a7 100644 --- 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 index 054f61d3698b6..ae75b3727c6d8 100644 --- 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/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/translations/test_default.en.xlf b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/translations/test_default.en.xlf similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/translations/test_default.en.xlf rename to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/translations/test_default.en.xlf