Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into 2.1

Conflicts:
	Form/Core/Validator/ReCaptchaValidator.php
  • Loading branch information...
commit c1f07df054aa162669905f2a8743efe504e465a5 2 parents 5afbd79 + 34192c0
@bamarni bamarni authored
View
2  Form/Core/Validator/CaptchaValidator.php
@@ -50,7 +50,7 @@ public function validate(DataEvent $event)
$this->captcha->getLength() !== strlen($data) ||
$this->captcha->getCode() !== $this->captcha->encode($data)
) {
- $form->addError(new FormError('The captcha is invalid'));
+ $form->addError(new FormError('The captcha is invalid.'));
}
$this->captcha->removeCode();
View
4 Resources/translations/validators.en.yml
@@ -0,0 +1,4 @@
+genemu_form:
+ recaptcha:
+ incorrect-captcha-sol: The captcha is invalid.
+ invalid-site-private-key: The private key is invalid.
View
6 Resources/translations/validators.fr.yml
@@ -0,0 +1,6 @@
+The captcha is invalid.: Le captcha est invalide.
+
+genemu_form:
+ recaptcha:
+ incorrect-captcha-sol: Le captcha n'est pas valide.
+ invalid-site-private-key: La clé privée est invalide.
View
4 Resources/views/Form/jquery_layout.html.twig
@@ -136,8 +136,8 @@
{% spaceless %}
<script type="text/javascript">
jQuery(document).ready(function($) {
- $field = $('#{{ id }}');
- $configs = $.extend({
+ var $field = $('#{{ id }}');
+ var $configs = $.extend({
color: '#' + $field.val(),
onBeforeShow: function() {
$(this).ColorPickerSetColor($field.val());
Please sign in to comment.
Something went wrong with that request. Please try again.