Skip to content

twig2 compatibility #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 7, 2017
Merged

twig2 compatibility #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
720db6c
twig2 compatibility
toooni Mar 7, 2017
cdda884
added quotes
toooni Mar 7, 2017
1d6fd06
use VERSION instead of MAJOR_VERSION which was introduced later
toooni Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions DependencyInjection/TranslationExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
use Symfony\Component\DependencyInjection\Loader;
use Symfony\Component\HttpKernel\Kernel;
use Translation\Bundle\Model\Configuration as ConfigurationModel;
use Translation\Extractor\Visitor\Twig\TranslationBlock;
use Translation\Extractor\Visitor\Twig\TranslationFilter;
use Translation\Extractor\Visitor\Twig\Twig2TranslationBlock;
use Translation\Extractor\Visitor\Twig\Twig2TranslationFilter;

/**
* This is the class that loads and manages your bundle configuration.
Expand All @@ -44,6 +48,14 @@ public function load(array $configs, ContainerBuilder $container)
$container->getDefinition('php_translation.extractor.php.visitor.FormTypeChoices')
->addMethodCall('setSymfonyMajorVersion', [Kernel::MAJOR_VERSION]);

if (version_compare(\Twig_Environment::VERSION, 2) === -1) {
$container->setParameter('php_translation.extractor.twig.visitor.translation_block.class', TranslationBlock::class);
$container->setParameter('php_translation.extractor.twig.visitor.translation_filter.class', TranslationFilter::class);
} else {
$container->setParameter('php_translation.extractor.twig.visitor.translation_block.class', Twig2TranslationBlock::class);
$container->setParameter('php_translation.extractor.twig.visitor.translation_filter.class', Twig2TranslationFilter::class);
}

$container->setParameter('php_translation.locales', $config['locales']);
$container->setParameter('php_translation.default_locale', isset($config['default_locale']) ? $config['default_locale'] : $container->getParameter('kernel.default_locale'));
$this->handleConfigNode($container, $config);
Expand Down
4 changes: 2 additions & 2 deletions Resources/config/extractors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ services:

# Twig Visitors:
php_translation.extractor.twig.visitor.translation_block:
class: Translation\Extractor\Visitor\Twig\TranslationBlock
class: '%php_translation.extractor.twig.visitor.translation_block.class%'
tags:
- { name: 'php_translation.visitor', type: 'twig' }

php_translation.extractor.twig.visitor.translation_filter:
class: Translation\Extractor\Visitor\Twig\TranslationFilter
class: '%php_translation.extractor.twig.visitor.translation_filter.class%'
tags:
- { name: 'php_translation.visitor', type: 'twig' }