diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 12e5cef95..f4c1f647e 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -486,7 +486,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state */ Application.Controllers.controller('CreateEventModalController', ['$scope', '$uibModalInstance', '$sce', 'moment', 'start', 'end', 'machinesPromise', 'Availability', 'trainingsPromise', 'spacesPromise', 'tagsPromise', 'growl', '_t', function ($scope, $uibModalInstance, $sce, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, tagsPromise, growl, _t) { - // $uibModal parameter + // $uibModal parameter $scope.start = start; // $uibModal parameter @@ -553,6 +553,9 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui // localized name(s) of the selected tag(s) $scope.tagsName = ''; + // make the duration available for display + $scope.slotDuration = Fablab.slotDuration; + /** * Adds or removes the provided machine from the current slot * @param machine {Object} diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 3b7f245c1..b30bbf3b7 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -159,6 +159,7 @@ +
{{ 'app.admin.calendar.divided_in_slots' }}
{{ 'app.admin.calendar.reservable' }} diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 85917cec2..5015616a0 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -58,6 +58,7 @@ fr: select_nb_period: "Veuillez choisir un nombre de périodes pour la récurrence" select_end_date: "Veuillez choisir la date de dernière occurrence" about_to_create: "Vous vous apprêtez à créer {NUMBER, plural, one{le créneau} other{les créneaux}} {TYPE, select, machines{machine} training{formation} space{espace} other{autre}} suivant :" + divided_in_slots: "Ce créneau sera proposé à la réservation par tranches de {DURATION} minutes. Contactez votre administrateur système pour modifier ce paramètre." reservable: "Réservable(s) :" labels: "Étiquette(s) :" none: "Aucune"