Skip to content

Support Twig2 and extractor 1.1.1 #81

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 2 commits into from
Mar 11, 2017
Merged

Support Twig2 and extractor 1.1.1 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab152b3
Support Twig2 and extractor 1.1.1
Nyholm Mar 11, 2017
8ec3f51
cs
Nyholm Mar 11, 2017
File filter

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: 0 additions & 12 deletions DependencyInjection/TranslationExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
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 @@ -48,14 +44,6 @@ 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
10 changes: 3 additions & 7 deletions Resources/config/extractors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ services:
- { name: 'php_translation.visitor', type: 'php' }

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

php_translation.extractor.twig.visitor.translation_filter:
class: '%php_translation.extractor.twig.visitor.translation_filter.class%'
php_translation.extractor.twig.visitor.twig:
class: Translation\Extractor\Visitor\Twig\Twig2Visitor
factory: [Translation\Extractor\Visitor\Twig\TwigVisitor, create]
tags:
- { name: 'php_translation.visitor', type: 'twig' }
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

"php-translation/common": "^0.2.1",
"php-translation/symfony-storage": "^0.2.1",
"php-translation/extractor": "^1.0"
"php-translation/extractor": "^1.1.1"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.4",
Expand Down