Commit ffff5bd5 authored by KhanhIceTea's avatar KhanhIceTea Committed by Fabien Potencier

Patch debug and caching translator (Symfony 2.6+ with caching enabled).

parent 5d5046e9
...@@ -28,7 +28,7 @@ class TranslationServiceProvider implements ServiceProviderInterface ...@@ -28,7 +28,7 @@ class TranslationServiceProvider implements ServiceProviderInterface
public function register(Application $app) public function register(Application $app)
{ {
$app['translator'] = $app->share(function ($app) { $app['translator'] = $app->share(function ($app) {
$translator = new Translator($app, $app['translator.message_selector']); $translator = new Translator($app, $app['translator.message_selector'], $app['translator.cache_dir'], $app['debug']);
// Handle deprecated 'locale_fallback' // Handle deprecated 'locale_fallback'
if (isset($app['locale_fallback'])) { if (isset($app['locale_fallback'])) {
...@@ -55,6 +55,7 @@ class TranslationServiceProvider implements ServiceProviderInterface ...@@ -55,6 +55,7 @@ class TranslationServiceProvider implements ServiceProviderInterface
$app['translator.domains'] = array(); $app['translator.domains'] = array();
$app['locale_fallbacks'] = array('en'); $app['locale_fallbacks'] = array('en');
$app['translator.cache_dir'] = null;
} }
public function boot(Application $app) public function boot(Application $app)
......
...@@ -23,11 +23,11 @@ class Translator extends BaseTranslator ...@@ -23,11 +23,11 @@ class Translator extends BaseTranslator
{ {
protected $app; protected $app;
public function __construct(Application $app, MessageSelector $selector) public function __construct(Application $app, MessageSelector $selector, $cacheDir = null, $debug = false)
{ {
$this->app = $app; $this->app = $app;
parent::__construct(null, $selector); parent::__construct(null, $selector, $cacheDir, $debug);
} }
public function getLocale() public function getLocale()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment