8000 [Validator] Integrated the Translator in the Validator component by webmozart · Pull Request #6137 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Validator] Integrated the Translator in the Validator component #6137

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 12 commits into from
Jan 9, 2013
Merged

[Validator] Integrated the Translator in the Validator component #6137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
46f751c
[Validator] Extracted message interpolation logic of ConstraintViolat…
webmozart Nov 27, 2012
e7eb5b0
[Form] Adapted Form component to translator integration in the validator
webmozart Nov 27, 2012
92a3b27
[TwigBridge] Adapted TwigBridge to translator integration in the vali…
webmozart Nov 27, 2012
c96a051
[FrameworkBundle] Adapted FrameworkBundle to translator integration i…
webmozart Nov 27, 2012
b94a256
[DoctrineBridge] Adapted DoctrineBridge to translator integration in …
webmozart Nov 27, 2012
1e34e91
[Form] Added upgrade instructions to the UPGRADE file
webmozart Nov 27, 2012
56d61eb
[Form][Validator] Added BC breaks in unstable code to the CHANGELOG
webmozart Nov 28, 2012
cc0df0a
[Validator] Changed validator to support pluralized messages by default
webmozart Dec 3, 2012
e00e5ec
[Validator] Fixed failing test
webmozart Dec 18, 2012
cd662cc
[Validator] Added ExceptionInterface, BadMethodCallException and Inva…
webmozart Jan 8, 2013
58bfd60
[Validator] Improved the inline documentation of DefaultTranslator
webmozart Jan 8, 2013
586a16e
[Validator] Changed DefaultTranslator::getLocale() to always return 'en'
webmozart Jan 8, 2013
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
Prev Previous commit
Next Next commit
[FrameworkBundle] Adapted FrameworkBundle to translator integration i… 
…n the validator
  • Loading branch information
@webmozart
webmozart committed Jan 8, 2013
commit c96a0511f221669e809e4d7d22902b1828ab5c06
2 changes: 1 addition & 1 deletion ...fony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddValidatorInitializersPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public function process(ContainerBuilder $container)
$initializers[] = new Reference($id);
}

$container->getDefinition('validator')->replaceArgument(2, $initializers);
$container->getDefinition('validator')->replaceArgument(4, $initializers);
}
}
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
->children()
->scalarNode('cache')->end()
->booleanNode('enable_annotations')->defaultFalse()->end()
->scalarNode('translation_domain')->defaultValue('validators')->end()
->end()
->end()
->end()
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
{
$loader->load('validator.xml');

$container->setParameter('validator.translation_domain', $config['translation_domain']);
$container->setParameter('validator.mapping.loader.xml_files_loader.mapping_files', $this->getValidatorXmlMappingFiles($container));
$container->setParameter('validator.mapping.loader.yaml_files_loader.mapping_files', $this->getValidatorYamlMappingFiles($container));

Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<service id="validator" class="%validator.class%">
<argument type="service" id="validator.mapping.class_metadata_factory" />
<argument type="service" id="validator.validator_factory" />
<argument type="service" id="translator.default" />
<argument>%validator.translation_domain%</argument>
<argument type="collection" />
</service>

Expand Down
16 changes: 1 addition & 15 deletions src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_errors.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
<?php if ($errors): ?>
<ul>
<?php foreach ($errors as $error): ?>
<li><?php
if (null === $error->getMessagePluralization()) {
echo $view['translator']->trans(
$error->getMessageTemplate(),
$error->getMessageParameters(),
'validators'
);
} else {
echo $view['translator']->transChoice(
$error->getMessageTemplate(),
$error->getMessagePluralization(),
$error->getMessageParameters(),
'validators'
);
}?></li>
<li><?php echo $error->getMessage() ?></li>
<?php endforeach; ?>
</ul>
<?php endif ?>
21 changes: 0 additions & 21 deletions src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php
View file
Open in desktop

This file was deleted.

0