diff --git a/packages/twenty-front/src/modules/localization/utils/detectTimeFormat.ts b/packages/twenty-front/src/modules/localization/utils/detectTimeFormat.ts index 0580333af..01bad1716 100644 --- a/packages/twenty-front/src/modules/localization/utils/detectTimeFormat.ts +++ b/packages/twenty-front/src/modules/localization/utils/detectTimeFormat.ts @@ -5,6 +5,10 @@ export const detectTimeFormat = () => { const isHour12 = Intl.DateTimeFormat(navigator.language, { hour: 'numeric', }).resolvedOptions().hour12; - if (isDefined(isHour12) && isHour12) return TimeFormat.HOUR_12; + + if (isDefined(isHour12) && isHour12) { + return TimeFormat.HOUR_12; + } + return TimeFormat.HOUR_24; }; diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx index c17f7a8e7..dcadd5ba9 100644 --- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx +++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx @@ -1,6 +1,7 @@ import { formatInTimeZone } from 'date-fns-tz'; import { DateFormat } from '@/localization/constants/DateFormat'; +import { detectDateFormat } from '@/localization/utils/detectDateFormat'; import { detectTimeZone } from '@/localization/utils/detectTimeZone'; import { Select } from '@/ui/input/components/Select'; @@ -15,7 +16,12 @@ export const DateTimeSettingsDateFormatSelect = ({ timeZone, value, }: DateTimeSettingsDateFormatSelectProps) => { - const setTimeZone = timeZone === 'system' ? detectTimeZone() : timeZone; + const systemTimeZone = detectTimeZone(); + + const usedTimeZone = timeZone === 'system' ? systemTimeZone : timeZone; + + const systemDateFormat = detectDateFormat(); + return ( { + const systemTimeZone = detectTimeZone(); + + const systemTimeZoneOption = findAvailableTimeZoneOption(systemTimeZone); + return (