From 39761c520ec743a44d36161dc7788dd74577b2b1 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Mon, 20 Dec 2021 12:55:49 +0100
Subject: [PATCH] Uses Intl to translate weekdays and time related booking i18n
 (#1354)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 components/booking/AvailableTimes.tsx    |  8 ++++----
 components/booking/DatePicker.tsx        | 18 ++++++++----------
 components/booking/pages/BookingPage.tsx |  5 ++++-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/components/booking/AvailableTimes.tsx b/components/booking/AvailableTimes.tsx
index e1e5ae9197603a..aefcc2239fefae 100644
--- a/components/booking/AvailableTimes.tsx
+++ b/components/booking/AvailableTimes.tsx
@@ -34,7 +34,7 @@ const AvailableTimes: FC<AvailableTimesProps> = ({
   users,
   schedulingType,
 }) => {
-  const { t } = useLocale();
+  const { t, i18n } = useLocale();
   const router = useRouter();
   const { rescheduleUid } = router.query;
 
@@ -58,10 +58,10 @@ const AvailableTimes: FC<AvailableTimesProps> = ({
     <div className="flex flex-col mt-8 text-center sm:pl-4 sm:mt-0 sm:w-1/3 md:-mb-5">
       <div className="mb-4 text-lg font-light text-left text-gray-600">
         <span className="w-1/2 text-gray-600 dark:text-white">
-          <strong>{t(date.format("dddd").toLowerCase())}</strong>
+          <strong>{date.toDate().toLocaleString(i18n.language, { weekday: "long" })}</strong>
           <span className="text-gray-500">
-            {date.format(", DD ")}
-            {t(date.format("MMMM").toLowerCase())}
+            {date.format(", D ")}
+            {date.toDate().toLocaleString(i18n.language, { month: "long" })}
           </span>
         </span>
       </div>
diff --git a/components/booking/DatePicker.tsx b/components/booking/DatePicker.tsx
index e52104d7646f0b..33284ef04125d7 100644
--- a/components/booking/DatePicker.tsx
+++ b/components/booking/DatePicker.tsx
@@ -8,6 +8,7 @@ import { useEffect, useMemo, useState } from "react";
 
 import classNames from "@lib/classNames";
 import { timeZone } from "@lib/clock";
+import { weekdayNames } from "@lib/core/i18n/weekday";
 import { useLocale } from "@lib/hooks/useLocale";
 import getSlots from "@lib/slots";
 import { WorkingHours } from "@lib/types/schedule";
@@ -82,8 +83,7 @@ function DatePicker({
   periodCountCalendarDays,
   minimumBookingNotice,
 }: DatePickerProps): JSX.Element {
-  const { t } = useLocale();
-
+  const { i18n } = useLocale();
   const [browsingDate, setBrowsingDate] = useState<Dayjs | null>(date);
 
   useEffect(() => {
@@ -157,7 +157,7 @@ function DatePicker({
       <div className="flex mb-4 text-xl font-light text-gray-600">
         <span className="w-1/2 text-gray-600 dark:text-white">
           <strong className="text-gray-900 dark:text-white">
-            {t(browsingDate.format("MMMM").toLowerCase())}
+            {browsingDate.toDate().toLocaleString(i18n.language, { month: "long" })}
           </strong>{" "}
           <span className="text-gray-500">{browsingDate.format("YYYY")}</span>
         </span>
@@ -178,13 +178,11 @@ function DatePicker({
         </div>
       </div>
       <div className="grid grid-cols-7 gap-4 text-center border-t border-b dark:border-gray-800 sm:border-0">
-        {["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
-          .sort((a, b) => (weekStart.startsWith(a) ? -1 : weekStart.startsWith(b) ? 1 : 0))
-          .map((weekDay) => (
-            <div key={weekDay} className="my-4 text-xs tracking-widest text-gray-500 uppercase">
-              {t(weekDay.toLowerCase()).substring(0, 3)}
-            </div>
-          ))}
+        {weekdayNames(i18n.language, weekStart === "Sunday" ? 0 : 1, "short").map((weekDay) => (
+          <div key={weekDay} className="my-4 text-xs tracking-widest text-gray-500 uppercase">
+            {weekDay}
+          </div>
+        ))}
       </div>
       <div className="grid grid-cols-7 gap-2 text-center">
         {days.map((day, idx) => (
diff --git a/components/booking/pages/BookingPage.tsx b/components/booking/pages/BookingPage.tsx
index 92cc4ba5d1ece8..e9d52e7e8140b5 100644
--- a/components/booking/pages/BookingPage.tsx
+++ b/components/booking/pages/BookingPage.tsx
@@ -283,7 +283,10 @@ const BookingPage = (props: BookingPageProps) => {
                 )}
                 <p className="mb-4 text-green-500">
                   <CalendarIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
-                  {parseZone(date).format(timeFormat + ", dddd DD MMMM YYYY")}
+                  {date &&
+                    parseZone(date).format(timeFormat) +
+                      ", " +
+                      dayjs(date).toDate().toLocaleString(i18n.language, { dateStyle: "full" })}
                 </p>
                 <p className="mb-8 text-gray-600 dark:text-white">{props.eventType.description}</p>
               </div>