Skip to content
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

Improve caldav calendar settings flow #786

Merged
merged 4 commits into from
Dec 10, 2024
Merged

Improve caldav calendar settings flow #786

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f27b23b
🌐 Catch up German translation
devmount Dec 7, 2024
627b435
🔨 Move color palette to definitions
devmount Dec 7, 2024
934aaec
➕ Implement CalDAV form feedback flow
devmount Dec 9, 2024
a6dfdff
➕ Add test ids
devmount Dec 10, 2024
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
8 changes: 7 additions & 1 deletion backend/src/appointment/controller/calendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,17 @@ def test_connection(self) -> bool:
except KeyError as ex:
logging.error(f'KE: Error testing connection {ex}')
return False
except (requests.exceptions.RequestException, caldav.lib.error.NotFoundError, caldav.lib.error.PropfindError) as ex:
except (
requests.exceptions.RequestException,
caldav.lib.error.NotFoundError,
caldav.lib.error.PropfindError,
caldav.lib.error.AuthorizationError
) as ex:
"""
RequestException: Max retries exceeded, bad connection, missing schema, etc...
NotFoundError: Good server, bad url.
PropfindError: Some properties could not be retrieved.
AuthorizationError: Credentials are not accepted.
devmount marked this conversation as resolved.
Show resolved Hide resolved
"""
return False

Expand Down
8 changes: 4 additions & 4 deletions backend/src/appointment/l10n/de/email.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ new-booking-plain = { $name } ({ $email }) hat soeben { $date } gebucht
# $duration (String) - Length of minutes the appointment will be
new-booking-html-heading-name = { $name }
new-booking-html-heading-email = ({ $email })
# FIXME: Google Translate Patch !
new-booking-html-heading-text = hat gerade Zeit im { $schedule_name } gebucht
new-booking-html-time = { $duration } mins

## Confirm Appointment

confirm-mail-subject = Buchungsanfrage von {-brand-name} bestätigen
# Variables
# $name (String) - Name of the person who requested the appointment
confirm-mail-subject = Buchungsanfrage von { $name } bestätigen
# Variables:
# $name (String) - Name of the person who requested the appointment
# $email (String) - Email of the person who requested the appointment
Expand Down Expand Up @@ -85,11 +86,10 @@ confirm-mail-plain = { $name } ({ $email }) hat soeben dieses Zeitfenster aus de
# $date (String) - Date of the requested appointment
# $schedule_name (String) - The name of the schedule used to book the appointment
# $duration (String) - Length of minutes the appointment will be
# FIXME: Google Translation patch !
confirm-mail-html-heading-name = { $name }
confirm-mail-html-heading-email = ({ $email })
confirm-mail-html-heading-text = fordert die Buchung eines Zeitfensters in { $schedule_name } an
confirm-mail-html-time = { $duration } mins
confirm-mail-html-time = { $duration } Minuten

confirm-mail-html-confirm-text = Dieser Link führt zur Bestätigung der Buchungsanfrage:
confirm-mail-html-confirm-action = Buchung bestätigen
Expand Down
Loading
Loading