From 68c07775ad8e3cc2a70b94ae57b0e13a4f35a02f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 13 Jul 2011 09:23:43 +0200 Subject: [PATCH] [FrameworkBundle] fixed translation loading process when a file does not respect the expected pattern (avoid loading foo.fr.xliff~ for instance) --- .../DependencyInjection/FrameworkExtension.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 3d859d9411..331efa415b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -490,7 +490,9 @@ class FrameworkExtension extends Extension // Register translation resources if ($dirs) { $finder = new Finder(); - $finder->files()->filter(function (\SplFileInfo $file) { return 2 === substr_count($file->getBasename(), '.'); })->in($dirs); + $finder->files()->filter(function (\SplFileInfo $file) { + return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename()); + })->in($dirs); foreach ($finder as $file) { // filename is domain.locale.format list($domain, $locale, $format) = explode('.', $file->getBasename());