rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

[bug] typo in allow/prevent booking overlapping slots

Browse Source
This commit is contained in:
Sylvain 2021-05-18 10:52:59 +02:00
parent d7471d6f2e
commit da3eb4f8bd
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Fix a bug: reservation of slots restricted to subscribers leads to invoices without invoiced_id
- Fix a bug: new installation with mapping to an external network does not connect fab-manager to elasticsearch
- Fix a bug: typo in allow/prevent booking overlapping slots
- Fix a security issue: updated puma to 4.3.8 to fix [CVE-2019-16770](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-16770)
- Fix a security issue: updated nokogiri to 1.11.4 to fix [GHSA-7rrm-v45f-jp64](https://github.com/advisories/GHSA-7rrm-v45f-jp64)

2
app/frontend/templates/admin/settings/reservations.html
View File

@ -87,7 +87,7 @@
<h3 class="m-l m-t-lg" translate>{{ 'app.admin.settings.book_overlapping_slots_info' }}</h3>
<boolean-setting name="book_overlapping_slots"
settings="allSettings"
label="app.admin.settings.allow_booking"
label="app.admin.settings.prevent_booking"
classes="m-l">
</boolean-setting>
</div>

2
config/locales/app.admin.de.yml
View File

@ -1088,7 +1088,7 @@ de:
error_SETTING_locked: "Die Einstellung konnte nicht aktualisiert werden: {SETTING} ist gesperrt. Bitte kontaktieren Sie Ihren Systemadministrator."
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"
allow_booking: "Buchungen erlauben"
prevent_booking: "Buchungen verhindern"
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."

2
config/locales/app.admin.en.yml
View File

@ -1088,7 +1088,7 @@ en:
error_SETTING_locked: "Unable to update the setting: {SETTING} is locked. Please contact your system administrator."
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"
allow_booking: "Allow booking"
prevent_booking: "Prevent 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."

2
config/locales/app.admin.es.yml
View File

@ -1088,7 +1088,7 @@ es:
error_SETTING_locked: "Unable to update the setting: {SETTING} is locked. Please contact your system administrator."
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"
allow_booking: "Allow booking"
prevent_booking: "Prevent 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."

2
config/locales/app.admin.fr.yml
View File

@ -1088,7 +1088,7 @@ fr:
error_SETTING_locked: "Impossible de mettre à jour le paramètre : {SETTING} est verrouillé. Veuillez contacter votre administrateur système."
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"
allow_booking: "Autoriser la réservation"
prevent_booking: "Empêcher 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é."

2
config/locales/app.admin.pt.yml
View File

@ -1088,7 +1088,7 @@ pt:
error_SETTING_locked: "Não foi possível atualizar a configuração: {SETTING} está bloqueado. Por favor contate o administrador do sistema."
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"
allow_booking: "Permitir reserva"
prevent_booking: "Permitir reserva"
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."

2
config/locales/app.admin.zu.yml
View File

@ -1088,7 +1088,7 @@ zu:
error_SETTING_locked: "crwdns20640:0{SETTING}crwdne20640:0"
an_error_occurred_saving_the_setting: "crwdns20380:0crwdne20380:0"
book_overlapping_slots_info: "crwdns20642:0crwdne20642:0"
allow_booking: "crwdns20644:0crwdne20644:0"
prevent_booking: "crwdns20644:0crwdne20644:0"
default_slot_duration: "crwdns20646:0crwdne20646:0"
duration_minutes: "crwdns20648:0crwdne20648:0"
default_slot_duration_info: "crwdns20650:0crwdne20650:0"