瀏覽代碼

[FrameworkBundle] fixed translation loading process when a file does not respect the expected pattern (avoid loading foo.fr.xliff~ for instance)

Fabien Potencier 14 年之前
父節點
當前提交
68c07775ad
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

+ 3 - 1
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());