From ea6b385b4f56a4565796fab15afa71e00cea2a9e Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Sat, 14 Jan 2023 18:31:02 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Better=20fix=20for=20the?= =?UTF-8?q?=20isoWeek=20bug=20in=20Timetable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/week.component.tsx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/skolplattformen-app/components/week.component.tsx b/apps/skolplattformen-app/components/week.component.tsx index 893223ec..40be97f8 100644 --- a/apps/skolplattformen-app/components/week.component.tsx +++ b/apps/skolplattformen-app/components/week.component.tsx @@ -107,13 +107,7 @@ export const Day = ({ weekDay, lunch, lessons }: DayProps) => { } export const Week = ({ child }: WeekProps) => { - const locale = LanguageService.getLocale() - moment.updateLocale(locale, { - week: { - dow: 1, // Monday is the first day of the week. - }, - }) - moment.locale(locale) + moment.locale(LanguageService.getLocale()) const days = moment.weekdaysShort().slice(1, 6) const displayDate = getMeaningfulStartingDate(moment()) @@ -165,7 +159,10 @@ export const Week = ({ child }: WeekProps) => { <> {weekDay} - {displayDate.startOf('week').add(index, 'day').format('D')} + {displayDate + .startOf('isoWeek') + .add(index, 'day') + .format('D')} )}