From 5765e3d2e4095fc1d2bfc306f7420d6f93568772 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Mar 2020 16:52:54 +0100 Subject: [PATCH] move availability options to new step + wording --- .../controllers/admin/calendar.js.erb | 4 ++-- .../admin/calendar/eventModal.html.erb | 17 +++++++++++------ config/locales/app.admin.ach.yml | 2 +- config/locales/app.admin.en.yml | 5 +++-- config/locales/app.admin.es.yml | 7 ++++--- config/locales/app.admin.fr.yml | 5 +++-- config/locales/app.admin.pt.yml | 5 +++-- config/locales/app.shared.en.yml | 2 +- config/locales/app.shared.es.yml | 2 +- config/locales/app.shared.fr.yml | 2 +- config/locales/app.shared.pt.yml | 2 +- 11 files changed, 31 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 45f0fed92..dbe3f349a 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -726,7 +726,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui $scope.next = function () { if ($scope.step === 1) { $scope.setNbTotalPlaces(); } if ($scope.step === 2) { return validateSelection(); } - if ($scope.step === 4) { return validateRecurrence(); } + if ($scope.step === 5) { return validateRecurrence(); } return $scope.step++; }; @@ -839,7 +839,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui if (!$scope.availability.period) { return growl.error(_t('app.admin.calendar.select_period')); } - if (!$scope.availability.nb_periods) { + if (!$scope.availability.nb_periods || $scope.availability.nb_periods < 1) { return growl.error(_t('app.admin.calendar.select_nb_period')); } if (!$scope.availability.end_date) { diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 371c68c51..10c3cdfc5 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -87,8 +87,13 @@ + +
+
+

{{ 'app.admin.calendar.restrict_options' }}

+
-

{{ 'app.admin.calendar.restrict_this_slot_with_labels_optional' }}

+

{{ 'app.admin.calendar.restrict_with_labels' }}

@@ -103,7 +108,7 @@
-

{{ 'app.admin.calendar.restrict_this_slot_for_subscriptions_optional' }}

+

{{ 'app.admin.calendar.restrict_for_subscriptions' }}

@@ -132,7 +137,7 @@
-
+

{{ 'app.admin.calendar.recurrence' }}

@@ -189,7 +194,7 @@
-
+

{{ 'app.admin.calendar.summary' }}

@@ -213,12 +218,12 @@
-
+
-
+
diff --git a/config/locales/app.admin.ach.yml b/config/locales/app.admin.ach.yml index 7ebffb963..1b6266adc 100644 --- a/config/locales/app.admin.ach.yml +++ b/config/locales/app.admin.ach.yml @@ -43,7 +43,7 @@ ach: number_of_tickets: "crwdns6761:0crwdne6761:0" adjust_the_opening_hours: "crwdns6763:0crwdne6763:0" to_time: crwdns10109:0crwdne10109:0 - restrict_this_slot_with_labels_optional: "crwdns6767:0crwdne6767:0" + restrict_with_labels: "crwdns6767:0crwdne6767:0" recurrence: "crwdns6769:0crwdne6769:0" enabled: "crwdns6771:0crwdne6771:0" period: "crwdns6773:0crwdne6773:0" diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 6ba268158..93cef9e2c 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -50,8 +50,9 @@ en: number_of_tickets: "Number of tickets: " adjust_the_opening_hours: "Adjust the opening hours" to_time: "to" # eg. from 18:00 to 21:00 - restrict_this_slot_with_labels_optional: "Restrict this slot with labels (optional)" - restrict_this_slot_for_subscriptions_optional: "Restrict this slot for subscription users (optional)" + restrict_options: "Restriction options" + restrict_with_labels: "Restrict this slot with labels" + restrict_for_subscriptions: "Restrict this slot for subscription users" select_some_plans: "Select some plans" plans: "Plan(s):" recurrence: "Recurrence" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 376f7166e..2cea728c9 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -49,9 +49,10 @@ es: manage_trainings: "Click here to add or remove trainings." number_of_tickets: "Número de tickets: " adjust_the_opening_hours: "Ajustar el horario de apertura" - to_time: a - restrict_this_slot_with_labels_optional: "Restringir este horario con etiquetas (opcional)" - restrict_this_slot_for_subscriptions_optional: "Restrict this slot for subscription users (optional)" + to_time: "a" # eg. from 18:00 to 21:00 + restrict_options: "Restriction options" + restrict_with_labels: "Restringir este horario con etiquetas" + restrict_for_subscriptions: "Restrict this slot for subscription users" select_some_plans: "Select some plans" plans: "Plan(s):" recurrence: "Recurrencia" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 1cae10b92..e8f7cd14c 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -50,8 +50,9 @@ fr: number_of_tickets: "Nombre de places : " adjust_the_opening_hours: "Ajuster l'horaire" to_time: "à" # eg. from 18:00 to 21:00 - restrict_this_slot_with_labels_optional: "Restreindre ce créneau avec des étiquettes (optionnel)" - restrict_this_slot_for_subscriptions_optional: "Restreindre ce créneau pour les abonnements (optionnel)" + restrict_options: "Options de restriction" + restrict_with_labels: "Restreindre ce créneau avec des étiquettes" + restrict_for_subscriptions: "Restreindre ce créneau pour les abonnements" select_some_plans: "Sélectionnez des formules d'abonnement" plans: "Abonnement(s):" recurrence: "Récurrence" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 0430bb1ce..65886be49 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -50,8 +50,9 @@ pt: number_of_tickets: "Número de vagas: " adjust_the_opening_hours: "Ajustar o horário de funcionamento" to_time: "ás" # eg. from 18:00 to 21:00 - restrict_this_slot_with_labels_optional: "Restrinja este slot com etiquetas (opcional)" - restrict_this_slot_for_subscriptions_optional: "Restrict this slot for subscription users (optional)" + restrict_options: "Restriction options" + restrict_with_labels: "Restrinja este slot com etiquetas" + restrict_for_subscriptions: "Restrict this slot for subscription users" select_some_plans: "Select some plans" plans: "Plan(s):" recurrence: "Recurrence" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 3c0bb0afb..fa64f839a 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -444,7 +444,7 @@ en: slot_restrict_plans_of_others_groups: "The slot is restricted for the subscribers of others groups." selected_plan_dont_match_slot: "Selected plan dont match this slot" user_plan_dont_match_slot: "User subscribed plan dont match this slot" - no_plan_match_slot: "You dont have any plan to match this slot" + no_plan_match_slot: "You dont have any matching plan for this slot" slot_at_same_time: "Conflict with others reservations" do_you_really_want_to_book_slot_at_same_time: "Do you really want to book this slot? Other bookings take place at the same time" unable_to_book_slot_because_really_have_reservation_at_same_time: "Unable to book this slot because the following reservation occurs at the same time." diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 7ecea4de1..8ee76bd4d 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -444,7 +444,7 @@ es: slot_restrict_plans_of_others_groups: "The slot is restricted for the subscribers of others groups." selected_plan_dont_match_slot: "Selected plan dont match this slot" user_plan_dont_match_slot: "User subscribed plan dont match this slot" - no_plan_match_slot: "You dont have any plan to match this slot" + no_plan_match_slot: "You dont have any matching plan for this slot" slot_at_same_time: "Conflict with others reservations" do_you_really_want_to_book_slot_at_same_time: "Do you really want to book this slot? Other bookings take place at the same time" unable_to_book_slot_because_really_have_reservation_at_same_time: "Unable to book this slot because the following reservation occurs at the same time." diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index ae442845d..052604fae 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -444,7 +444,7 @@ fr: slot_restrict_plans_of_others_groups: "Ce créneau est restreint pour les abonnés d'autres groupes." selected_plan_dont_match_slot: "L'abonnement sélectionné ne correspondent pas ce créneau" user_plan_dont_match_slot: "L'abonnement du membre ne correspondent pas ce créneau" - no_plan_match_slot: "Aucun abonnement correspondent ce créneau" + no_plan_match_slot: "Aucun abonnement correspondant pour ce créneau" slot_at_same_time: "Conflit avec d'autres réservations" do_you_really_want_to_book_slot_at_same_time: "Êtes-vous sûr de réserver ce créneau ? D'autres réservations ont lieu en même temps" unable_to_book_slot_because_really_have_reservation_at_same_time: "Impossible de réserver ce créneau car les réservations ci-dessous ont lieu en même temps." diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 50413e721..77b327d57 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -444,7 +444,7 @@ pt: slot_restrict_plans_of_others_groups: "The slot is restricted for the subscribers of others groups." selected_plan_dont_match_slot: "Selected plan dont match this slot" user_plan_dont_match_slot: "User subscribed plan dont match this slot" - no_plan_match_slot: "You dont have any plan to match this slot" + no_plan_match_slot: "You dont have any matching plan for this slot" slot_at_same_time: "Conflict with others reservations" do_you_really_want_to_book_slot_at_same_time: "Do you really want to book this slot? Other bookings take place at the same time" unable_to_book_slot_because_really_have_reservation_at_same_time: "Unable to book this slot because the following reservation occurs at the same time."