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

Jump to bottom

fix: 🐛 Week starts on monday regardless of selected locale #642

Merged
merged 2 commits into from
Jan 14, 2023
Merged

fix: 🐛 Week starts on monday regardless of selected locale #642

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7376740
fix: 🐛 Week starts on monday regardless of selected locale
kajetan-kazimierczak Jan 14, 2023
b21955c
style: 💄 lint
kajetan-kazimierczak Jan 14, 2023
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 apps/skolplattformen-app/components/week.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,13 @@ export const Day = ({ weekDay, lunch, lessons }: DayProps) => {
}

export const Week = ({ child }: WeekProps) => {
moment.locale(LanguageService.getLocale())
const locale = LanguageService.getLocale()
moment.updateLocale(locale, {
week: {
dow: 1, // Monday is the first day of the week.
},
})
moment.locale(locale)
const days = moment.weekdaysShort().slice(1, 6)
const displayDate = getMeaningfulStartingDate(moment())

Expand Down