diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] Look for translations in %kernel.root_dir%/Resources/%bundle%/translations (fix #4018)

Browse Source
This commit is contained in:
Victor Berchet 2012-04-20 14:17:18 +02:00
parent 539634cbaa
commit 3937561b20
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -528,11 +528,15 @@ class FrameworkExtension extends Extension
// Discover translation directories // Discover translation directories
$dirs = array(); $dirs = array();
foreach ($container->getParameter('kernel.bundles') as $bundle) { $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
$reflection = new \ReflectionClass($bundle); foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
$reflection = new \ReflectionClass($class);
if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/translations')) { if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/translations')) {
$dirs[] = $dir; $dirs[] = $dir;
} }
if (is_dir($dir = sprintf($overridePath, $bundle))) {
$dirs[] = $dir;
}
} }
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) { if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {
$dirs[] = $dir; $dirs[] = $dir;
@ -540,14 +544,16 @@ class FrameworkExtension extends Extension
// Register translation resources // Register translation resources
if ($dirs) { if ($dirs) {
$finder = new Finder(); $finder = Finder::create()
$finder->files()->filter(function (\SplFileInfo $file) { ->files()
return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename()); ->filter(function (\SplFileInfo $file) {
})->in($dirs); return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
})
->in($dirs)
;
foreach ($finder as $file) { foreach ($finder as $file) {
// filename is domain.locale.format // filename is domain.locale.format
list($domain, $locale, $format) = explode('.', $file->getBasename(), 3); list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
$translator->addMethodCall('addResource', array($format, (string) $file, $locale, $domain)); $translator->addMethodCall('addResource', array($format, (string) $file, $locale, $domain));
} }
} }