From f644bbc0271dbef4444b84bd27bc734cbfd752db Mon Sep 17 00:00:00 2001 From: noel guilbert Date: Fri, 29 Apr 2011 17:48:38 +0200 Subject: [PATCH] [translations] Moved the application translations directory under Resources to be consistent with bundles --- UPDATE.md | 11 +++++++++++ .../DependencyInjection/FrameworkExtension.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/UPDATE.md b/UPDATE.md index f8833ea007..0552fc3c37 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -44,6 +44,17 @@ beta1 to beta2 Before: array('default', 'foo') After: array('default' => 'doctrine.orm.default_entity_manager', 'foo' => 'doctrine.orm.foo_entity_manager')) +* Application translation are now in the `Resources` folder: + + Before: + + app/translations/catalogue.fr.xml + + After: + + app/Resources/translations/catalogue.fr.xml + + PR12 to beta1 ------------- diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index cfb88a40e8..51434b0d04 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -440,7 +440,7 @@ class FrameworkExtension extends Extension $dirs[] = $dir; } } - if (is_dir($dir = $container->getParameter('kernel.root_dir').'/translations')) { + if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) { $dirs[] = $dir; }