Commit 9674ce90 authored by Fabien Potencier's avatar Fabien Potencier

added auto-registration of translations for the validator and form error messages

parent c3273183
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
}, },
"require-dev": { "require-dev": {
"symfony/security": "2.1.*", "symfony/security": "2.1.*",
"symfony/config": "2.1.*",
"symfony/form": "2.1.*", "symfony/form": "2.1.*",
"monolog/monolog": ">=1.0.0,<1.2-dev", "monolog/monolog": ">=1.0.0,<1.2-dev",
"symfony/browser-kit": "2.1.*", "symfony/browser-kit": "2.1.*",
......
{ {
"hash": "e30e4b42f5fb1991fa491aefe225cc2e", "hash": "0fe59be3a3e94c9b77fc20e18faaea0e",
"packages": [ "packages": [
{ {
"package": "pimple/pimple", "package": "pimple/pimple",
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
"source-reference": "0ba1372991110629f44ed076dfc5b93240a4a19a" "source-reference": "c013c12c925f9cacd1834b49f2c4bd6cfb2a52d3"
}, },
{ {
"package": "symfony/browser-kit", "package": "symfony/browser-kit",
...@@ -100,6 +100,17 @@ ...@@ -100,6 +100,17 @@
"version": "dev-master", "version": "dev-master",
"source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e" "source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e"
}, },
{
"package": "symfony/config",
"version": "dev-master",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
},
{
"package": "symfony/config",
"version": "dev-master",
"source-reference": "ac127ca0a1002726953eced989897e7b5c454292"
},
{ {
"package": "symfony/css-selector", "package": "symfony/css-selector",
"version": "dev-master", "version": "dev-master",
...@@ -142,7 +153,7 @@ ...@@ -142,7 +153,7 @@
{ {
"package": "symfony/form", "package": "symfony/form",
"version": "dev-master", "version": "dev-master",
"source-reference": "678c4b40815c322c9fae6e2b5b3d6a951c0e021f" "source-reference": "810e9ddffab12d0c90dc5bd7c430aa04cdb053a1"
}, },
{ {
"package": "symfony/locale", "package": "symfony/locale",
...@@ -230,13 +241,7 @@ ...@@ -230,13 +241,7 @@
{ {
"package": "symfony/validator", "package": "symfony/validator",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "source-reference": "2787f1d5725874054275cdd03730a258d4460582"
"alias-version": "2.1.9999999.9999999-dev"
},
{
"package": "symfony/validator",
"version": "dev-master",
"source-reference": "8dc28e8b8f0c829322b6349979efc069f03db0c2"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
......
...@@ -46,6 +46,16 @@ Registering ...@@ -46,6 +46,16 @@ Registering
"symfony/form": "2.1.*" "symfony/form": "2.1.*"
} }
If you are going to use the validation extension with forms, you must also
register the ``symfony/config`` and ```symfony/translation`` components::
.. code-block:: json
"require": {
"symfony/config": "2.1.*",
"symfony/translation": "2.1.*"
}
Usage Usage
----- -----
......
...@@ -39,6 +39,11 @@ class FormServiceProvider implements ServiceProviderInterface ...@@ -39,6 +39,11 @@ class FormServiceProvider implements ServiceProviderInterface
if (isset($app['validator'])) { if (isset($app['validator'])) {
$extensions[] = new FormValidatorExtension($app['validator']); $extensions[] = new FormValidatorExtension($app['validator']);
if (isset($app['translator'])) {
$r = new \ReflectionClass('Symfony\Component\Form\Form');
$app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.en.xlf', 'en', 'validators');
}
} }
return new FormFactory($extensions); return new FormFactory($extensions);
......
...@@ -29,6 +29,11 @@ class ValidatorServiceProvider implements ServiceProviderInterface ...@@ -29,6 +29,11 @@ class ValidatorServiceProvider implements ServiceProviderInterface
public function register(Application $app) public function register(Application $app)
{ {
$app['validator'] = $app->share(function () use ($app) { $app['validator'] = $app->share(function () use ($app) {
if (isset($app['translator'])) {
$r = new \ReflectionClass('Symfony\Component\Validator\Validator');
$app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.en.xlf', 'en', 'validators');
}
return new Validator( return new Validator(
$app['validator.mapping.class_metadata_factory'], $app['validator.mapping.class_metadata_factory'],
$app['validator.validator_factory'] $app['validator.validator_factory']
......
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