Skip to content

Org: Adds administrative reservation blockers in the occupancy calendar #2301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daverball merged 4 commits into from
Jan 15, 2026
Merged

Org: Adds administrative reservation blockers in the occupancy calendar #2301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0535a72
Org: Adds administrative reservation blockers in the occupancy calendar
Daverball Jan 15, 2026
4332483
Adds translations
Daverball Jan 15, 2026
edf934c
Fixes a couple of minor issues in JS
Daverball Jan 15, 2026
e2b178a
Adds basic test for new views.
Daverball Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ install_requires =
kerberos
lazy-object-proxy
ldap3
# NOTE: Upper-bound Will be removed once OGC-2780 is merged
libres>=0.9.0,<=0.10.0
libres>=0.10.0
libsass
lingua-language-detector
lxml
Expand Down
15 changes: 15 additions & 0 deletions src/onegov/org/assets/js/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
var locales = {
de: {
"Allocation": "Verfügbarkeit",
"Blocker": "Sperrzeit",
"Reason": "Grund für Sperrung",
"Add": "Hinzufügen",
"Update": "Aktualisieren",
"Delete": "Löschen",
"Failed to delete": "Löschen fehlgeschlagen",
"Count": "Anzahl",
"Dates": "Termine",
"From": "Von",
Expand Down Expand Up @@ -34,7 +39,12 @@ var locales = {
},
fr: {
"Allocation": "Allocation",
"Blocker": "Bloqueur",
"Reason": "Raison",
"Add": "Ajouter",
"Update": "Actualiser",
"Delete": "Supprimer",
"Failed to delete": "Impossible de supprimer",
"Count": "Nombre",
"Dates": "Dates",
"From": "De",
Expand Down Expand Up @@ -67,7 +77,12 @@ var locales = {
},
it: {
"Allocation": "Allocazione",
"Blocker": "Bloccante",
"Reason": "Motivo",
"Add": "Aggiungi",
"Update": "Aggiorna",
"Delete": "Elimina",
"Failed to delete": "Impossibile eliminare",
"Count": "Conta",
"Dates": "Date",
"From": "A partire dal",
Expand Down
Loading