diff --git a/Resolver/WidgetFormContentResolver.php b/Resolver/WidgetFormContentResolver.php new file mode 100644 index 0000000..ef4ce1c --- /dev/null +++ b/Resolver/WidgetFormContentResolver.php @@ -0,0 +1,59 @@ +currentViewHelper = $currentViewHelper; + } + + /** + * Get the static content of the widget. + * + * @param Widget $widget + * + * @return string + */ + public function getWidgetStaticContent(Widget $widget) + { + $parameters = parent::getWidgetStaticContent($widget); + $parameters = self::addMonthParameters($widget, $parameters); + + return $parameters; + } + + protected function addMonthParameters(Widget $widget, $parameters) + { + $currentView = $this->currentViewHelper->getCurrentView(); + $locale = $currentView->getCurrentLocale(); + $formatter = new IntlDateFormatter($locale, 0, 0); + + $months = []; + $date = new \DateTime(); + foreach (range(1, 12) as $monthNumber) { + $date->setDate(2012, $monthNumber, 1); + $formatter->setPattern('MMMM'); + $months[$monthNumber] = $formatter->format($date); + } + + $parameters = array_merge($parameters, [ + 'months' => $months + ]); + + return $parameters; + } +} diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 76c13e4..5f2604c 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -1,6 +1,9 @@ services: victoire_core.widget_form_content_resolver: - class: Victoire\Bundle\WidgetBundle\Resolver\BaseWidgetContentResolver + parent: victoire_widget.base_widget_content_resolver + class: Victoire\Widget\FormBundle\Resolver\WidgetFormContentResolver + arguments: + - '@victoire_core.current_view' tags: - { name: victoire_widget.widget_content_resolver, alias: Form } diff --git a/Resources/public/js/validator.js b/Resources/public/js/validator.js index 2e6df32..832a1f0 100644 --- a/Resources/public/js/validator.js +++ b/Resources/public/js/validator.js @@ -6,7 +6,7 @@ $(document).ready(function () { var form_group = $(this).parents('.form-group'); if(re.test($(this).val()) !== true) { form_group.addClass('has-error'); - form_group.find('.help-block').text($(this).val() + ' n\'est pas un email valide').show(); + form_group.find('.help-block').text(Translator.trans('victoire_widget_form.email.not.valid', {'email' : $(this).val()})).show(); event.preventDefault(); } else { form_group.removeClass('has-error'); diff --git a/Resources/translations/messages.en.xliff b/Resources/translations/messages.en.xliff index 4ad6783..5eaacc5 100644 --- a/Resources/translations/messages.en.xliff +++ b/Resources/translations/messages.en.xliff @@ -66,6 +66,10 @@ victoire_widget_form.message.admin.newMessage New message: + + victoire_widget_form.email.not.valid + %email% is not a valid email + diff --git a/Resources/translations/messages.es.xliff b/Resources/translations/messages.es.xliff index f55a774..be14c59 100644 --- a/Resources/translations/messages.es.xliff +++ b/Resources/translations/messages.es.xliff @@ -66,6 +66,10 @@ victoire_widget_form.message.admin.newMessage Nuevo puesto: + + victoire_widget_form.email.not.valid + %email% no es una dirección de e-mail valida + diff --git a/Resources/translations/messages.fr.xliff b/Resources/translations/messages.fr.xliff index 00617d8..247ceaa 100644 --- a/Resources/translations/messages.fr.xliff +++ b/Resources/translations/messages.fr.xliff @@ -66,6 +66,10 @@ victoire_widget_form.message.admin.newMessage Nouveau message: + + victoire_widget_form.email.not.valid + %email% n'est pas un email valide + diff --git a/Resources/translations/victoire.en.xliff b/Resources/translations/victoire.en.xliff index 405cdfa..8b8ab98 100644 --- a/Resources/translations/victoire.en.xliff +++ b/Resources/translations/victoire.en.xliff @@ -214,23 +214,23 @@ widget_form.form.choice.style.label.default Default - + widget_form.form.choice.style.label.primary - Principal + Primary - + widget_form.form.choice.style.label.success - Succès + Succes - + widget_form.form.choice.style.label.info - Informatif + Informative - + widget_form.form.choice.style.label.warning - Avertissement + Warning - + widget_form.form.choice.style.label.danger Danger diff --git a/Resources/translations/victoire.fr.xliff b/Resources/translations/victoire.fr.xliff index c015d5e..20f5895 100644 --- a/Resources/translations/victoire.fr.xliff +++ b/Resources/translations/victoire.fr.xliff @@ -242,23 +242,23 @@ widget_form.form.choice.style.label.default Par défaut - + widget_form.form.choice.style.label.primary - Primary + Principal - + widget_form.form.choice.style.label.success - Succes + Succès - + widget_form.form.choice.style.label.info - Informative + Informatif - + widget_form.form.choice.style.label.warning - Warning + Avertissement - + widget_form.form.choice.style.label.danger Danger diff --git a/Resources/views/formCreatorQuestion.html.twig b/Resources/views/formCreatorQuestion.html.twig index 9c79ad5..30f6d65 100644 --- a/Resources/views/formCreatorQuestion.html.twig +++ b/Resources/views/formCreatorQuestion.html.twig @@ -72,12 +72,12 @@
{{ form_row(form.successCallback) }} +
+ {{ form_row(form.successMessage) }} +
{{ form_widget(form.link) }}
-
- {{ form_row(form.successMessage) }} -
{{ form_row(form.targetEmail) }} {{ form_row(form.adminSubject) }}
@@ -71,13 +71,13 @@ CKEDITOR.instances[instance].updateElement(); } }); - $vic('#static_widget_form_successCallback').on('change', function() { + $vic('#{{ quantum }}_static_widget_form_successCallback').on('change', function() { $vic('#widget-form-success-notification, #widget-form-success-redirect').addClass('hidden'); $vic('#widget-form-success-' + $vic(this).val()).removeClass('hidden'); }); $vic(document).ready(function() { - $vic('#static_widget_form_errorNotification').on('click', function() { + $vic('#{{ quantum }}_static_widget_form_errorNotification').on('click', function() { $vic('#widget-form-error-messsage').toggleClass('hidden'); }); }); diff --git a/Resources/views/show.html.twig b/Resources/views/show.html.twig index 802ee29..ab3a63e 100644 --- a/Resources/views/show.html.twig +++ b/Resources/views/show.html.twig @@ -87,7 +87,6 @@ {% if question.prefix %} {% endif %} - {{ question.type }} {% elseif question.type == "date" %} @@ -102,7 +101,6 @@ {% endfor %}