From 026dba36d545746e07d9f8216fe5be384a20af38 Mon Sep 17 00:00:00 2001
From: Melissa Autumn <melissa@thunderbird.net>
Date: Wed, 20 Mar 2024 10:35:09 -0700
Subject: [PATCH 1/3] Update the invalid link error page to be more generic.

---
 .../{BookingViewInvalidLink.vue => BookingViewError.vue}      | 4 ++--
 frontend/src/locales/en.json                                  | 2 ++
 frontend/src/views/BookingView.vue                            | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename frontend/src/components/bookingView/{BookingViewInvalidLink.vue => BookingViewError.vue} (85%)

diff --git a/frontend/src/components/bookingView/BookingViewInvalidLink.vue b/frontend/src/components/bookingView/BookingViewError.vue
similarity index 85%
rename from frontend/src/components/bookingView/BookingViewInvalidLink.vue
rename to frontend/src/components/bookingView/BookingViewError.vue
index 6436601da..30215b9c6 100644
--- a/frontend/src/components/bookingView/BookingViewInvalidLink.vue
+++ b/frontend/src/components/bookingView/BookingViewError.vue
@@ -1,10 +1,10 @@
 <template>
   <art-invalid-link class="my-6 h-auto max-w-sm"/>
   <div class="text-xl font-semibold text-sky-600">
-    {{ heading ?? t('info.bookingLinkHasAlreadyBeenUsed') }}
+    {{ heading ?? t('error.somethingWentWrong') }}
   </div>
   <div class="text-gray-800 dark:text-gray-300">
-    {{ body ?? t('info.bookedPleaseCheckEmail') }}
+    {{ body ?? t('error.generalBookingError') }}
   </div>
   <primary-button
     class="mt-12 p-7"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 7a6433b66..fb45e104f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -7,12 +7,14 @@
     "actionNeeded": "Action needed",
     "authenticationRequired": "Sorry, this page requires you to be logged in.",
     "credentialsIncomplete": "Please provide login credentials.",
+    "generalBookingError": "Sorry, there was a problem retrieving schedule details. Please try again later.",
     "googleRefreshError": "Error connecting with Google API, please re-connect.",
     "loginMethodNotSupported": "Login method not supported. Please try again.",
     "minimumValue": "{field} should be at least {value}.",
     "noConnectedCalendars": "Calendar setup required. Connect a calendar to continue. {0}.",
     "noConnectedCalendarsLink": "Go to settings",
     "routeNotFound": "Sorry, this page could not be found.",
+    "somethingWentWrong": "Something went wrong",
     "unknownAppointmentError": "There was an issue creating your booking. Please try again.",
     "unknownScheduleError": "There was an issue creating your schedule. Please try again.",
     "usernameIsNotAvailable": "Username not available. Please choose another."
diff --git a/frontend/src/views/BookingView.vue b/frontend/src/views/BookingView.vue
index 78b1d1204..b0b5cf49a 100644
--- a/frontend/src/views/BookingView.vue
+++ b/frontend/src/views/BookingView.vue
@@ -12,7 +12,7 @@
       v-else-if="activeView === views.invalid"
       class="flex-center h-screen select-none flex-col gap-8 px-4"
     >
-      <booking-view-invalid-link
+      <booking-view-error
         :heading="errorHeading"
         :body="errorBody"
       />
@@ -69,7 +69,7 @@ import { useBookingViewStore } from '@/stores/booking-view-store';
 import { useBookingModalStore } from '@/stores/booking-modal-store';
 import BookingViewSlotSelection from '@/components/bookingView/BookingViewSlotSelection.vue';
 import BookingViewSuccess from '@/components/bookingView/BookingViewSuccess.vue';
-import BookingViewInvalidLink from '@/components/bookingView/BookingViewInvalidLink.vue';
+import BookingViewError from '@/components/bookingView/BookingViewError.vue';
 
 // component constants
 const route = useRoute();

From ca06d333cec3ea056a88412dc96cb6dd804c6839 Mon Sep 17 00:00:00 2001
From: Melissa Autumn <melissa@thunderbird.net>
Date: Wed, 20 Mar 2024 10:36:24 -0700
Subject: [PATCH 2/3] Better english

---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index fb45e104f..b39e49925 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -7,7 +7,7 @@
     "actionNeeded": "Action needed",
     "authenticationRequired": "Sorry, this page requires you to be logged in.",
     "credentialsIncomplete": "Please provide login credentials.",
-    "generalBookingError": "Sorry, there was a problem retrieving schedule details. Please try again later.",
+    "generalBookingError": "Sorry, there was a problem retrieving the schedule details. Please try again later.",
     "googleRefreshError": "Error connecting with Google API, please re-connect.",
     "loginMethodNotSupported": "Login method not supported. Please try again.",
     "minimumValue": "{field} should be at least {value}.",

From b319154a02c0cfb3669bf0b492eec117aabfa31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <mail@devmount.de>
Date: Fri, 22 Mar 2024 11:49:39 +0100
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8C=90=20complete=20German=20translat?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/locales/de.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 12c510504..38d165a07 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -7,12 +7,14 @@
     "actionNeeded": "Aktion erforderlich!",
     "authenticationRequired": "Sorry, um diese Seite zu sehen ist eine Anmeldung erforderlich.",
     "credentialsIncomplete": "Bitte gib deine Zugangsdaten ein.",
+    "generalBookingError": "Beim Abrufen des Zeitplans ist ein Problem aufgetreten. Bitte später nochmal versuchen.",
     "googleRefreshError": "Es gab ein Problem mit Google, bitte erneut verbinden.",
     "loginMethodNotSupported": "Login-Methode wird nicht unterstützt. Bitte nochmal versuchen.",
     "minimumValue": "{field} sollte wenigstens {value} sein.",
     "noConnectedCalendars": "Kalendereinrichtung zum Fortfahren erforderlich. {0}.",
     "noConnectedCalendarsLink": "Zu den Einstellungen wechseln.",
     "routeNotFound": "Sorry, diese Seite wurde nicht gefunden.",
+    "somethingWentWrong": "Etwas ist schiefgelaufen",
     "unknownAppointmentError": "Es gab ein Problem beim Erstellen des Termins. Bitte nochmal versuchen.",
     "unknownScheduleError": "Es gab ein Problem beim Erstellen des Zeitplans.",
     "usernameIsNotAvailable": "Dieser Benutzername ist nicht verfügbar."