ConfrerieDuKassoulait/Botanique
ConfrerieDuKassoulait/Botanique
2
0
Fork 0
Code Issues 22 Pull requests 3 Projects 1 Releases Packages 1 Activity Actions

chore: merge dev to main #181

Merged
Anri merged 40 commits from dev into main 2024-09-27 20:49:36 +02:00
Conversation 1 Commits 40 Files changed 15 +2 -1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b78ccb801f - Show all commits

3
src/utils/time.ts
View file

@ -9,8 +9,9 @@ import moment from "moment-timezone";
*/ */
export const showDate = (tz: string, locale: Map<string, unknown>, date: Date) => { export const showDate = (tz: string, locale: Map<string, unknown>, date: Date) => {
const localeInfo = new Intl.Locale(tz); const localeInfo = new Intl.Locale(tz);
const intlTimezone = moment.tz.zonesForCountry(localeInfo.region ?? localeInfo.baseName);
const formattedDate = new Intl.DateTimeFormat(tz, { const formattedDate = new Intl.DateTimeFormat(tz, {
timeZone: moment.tz.zonesForCountry(localeInfo.region ?? localeInfo.baseName)[0], timeZone: intlTimezone ? intlTimezone[0] : "Etc/GMT",
dateStyle: "short", dateStyle: "short",
timeStyle: "medium", timeStyle: "medium",
}) })