From 2c78ab9cee424a1a2896c676d665fd7603253ee6 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Wed, 15 Sep 2021 18:42:37 +0200 Subject: [PATCH] fix bug: book overlapping slot setting labal error --- app/frontend/templates/admin/settings/reservations.html | 2 +- config/locales/app.admin.de.yml | 1 + config/locales/app.admin.en.yml | 1 + config/locales/app.admin.es.yml | 1 + config/locales/app.admin.fr.yml | 1 + config/locales/app.admin.pt.yml | 1 + config/locales/app.admin.zu.yml | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/frontend/templates/admin/settings/reservations.html b/app/frontend/templates/admin/settings/reservations.html index ad2a10ec1..3256390ba 100644 --- a/app/frontend/templates/admin/settings/reservations.html +++ b/app/frontend/templates/admin/settings/reservations.html @@ -87,7 +87,7 @@

{{ 'app.admin.settings.book_overlapping_slots_info' }}

diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 17b4d2124..a552b97ba 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1155,6 +1155,7 @@ de: an_error_occurred_saving_the_setting: "Beim Speichern der Einstellung ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut." book_overlapping_slots_info: "Erlauben / Verhindern der Reservierung von überlappenden Slots" prevent_booking: "Buchungen verhindern" + allow_booking: "Allow booking" default_slot_duration: "Standarddauer für Slots" duration_minutes: "Dauer (in Minuten)" default_slot_duration_info: "Die Verfügbarkeit von Maschinen und Räumen ist in mehrere Slots dieser Dauer aufgeteilt. Dieser Wert kann je Verfügbarkeit überschrieben werden." diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 309ddde02..eca48aa8b 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -1155,6 +1155,7 @@ en: an_error_occurred_saving_the_setting: "An error occurred while saving the setting. Please try again later." book_overlapping_slots_info: "Allow / prevent the reservation of overlapping slots" prevent_booking: "Prevent booking" + allow_booking: "Allow booking" default_slot_duration: "Default duration for slots" duration_minutes: "Duration (in minutes)" default_slot_duration_info: "Machine and space availabilities are divided in multiple slots of this duration. This value can be overridden per availability." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index b95f8e1d0..d1b913868 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1155,6 +1155,7 @@ es: an_error_occurred_saving_the_setting: "An error occurred while saving the setting. Please try again later." book_overlapping_slots_info: "Allow / prevent the reservation of overlapping slots" prevent_booking: "Impedir reservas" + allow_booking: "Allow booking" default_slot_duration: "Default duration for slots" duration_minutes: "Duration (in minutes)" default_slot_duration_info: "Machine and space availabilities are divided in multiple slots of this duration. This value can be overridden per availability." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 023717e63..a64575f71 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1155,6 +1155,7 @@ fr: an_error_occurred_saving_the_setting: "Une erreur est survenue pendant l'enregistrement du paramètre. Veuillez réessayer plus tard." book_overlapping_slots_info: "Autoriser / empêcher la réservation de créneaux qui se chevauchent" prevent_booking: "Empêcher la réservation" + allow_booking: "Autoriser la réservation" default_slot_duration: "Durée par défaut pour les créneaux" duration_minutes: "Durée (en minutes)" default_slot_duration_info: "Les disponibilités des machines et des espaces sont divisées en plusieurs créneaux de cette durée. Cette valeur peur être changée pour chaque disponibilité." diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 23cce9858..46b010cd3 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1155,6 +1155,7 @@ pt: an_error_occurred_saving_the_setting: "Ocorreu um erro ao salvar a configuração. Por favor, tente novamente mais tarde." book_overlapping_slots_info: "Permitir / impedir a reserva de slots sobrepostos" prevent_booking: "Prevent booking" + allow_booking: "Allow booking" default_slot_duration: "Duração padrão para slots" duration_minutes: "Duração (em minutos)" default_slot_duration_info: "Máquina e espaço disponíveis são divididos em vários slots desta duração. Esse valor pode ser substituído por disponibilidade." diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 226622c87..d4031585d 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1155,6 +1155,7 @@ zu: an_error_occurred_saving_the_setting: "crwdns20380:0crwdne20380:0" book_overlapping_slots_info: "crwdns20642:0crwdne20642:0" prevent_booking: "crwdns21478:0crwdne21478:0" + allow_booking: "Allow booking" default_slot_duration: "crwdns20646:0crwdne20646:0" duration_minutes: "crwdns20648:0crwdne20648:0" default_slot_duration_info: "crwdns20650:0crwdne20650:0"