diff --git a/apps/frontend/src/components/launches/calendar.tsx b/apps/frontend/src/components/launches/calendar.tsx
index 6aac17c6..91c016b4 100644
--- a/apps/frontend/src/components/launches/calendar.tsx
+++ b/apps/frontend/src/components/launches/calendar.tsx
@@ -27,9 +27,18 @@ import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
import { groupBy, sortBy } from 'lodash';
import Image from 'next/image';
import { extend } from 'dayjs';
+import { isUSCitizen } from './helpers/isuscitizen.utils';
extend(isSameOrAfter);
extend(isSameOrBefore);
+const convertTimeFormatBasedOnLocality = (time: number) => {
+ if (isUSCitizen()) {
+ return `${time === 12 ? 12 : time%12}:00 ${time >= 12 ? "PM" : "AM"}`
+ } else {
+ return `${time}:00`
+ }
+}
+
export const days = [
'Monday',
'Tuesday',
@@ -91,7 +100,7 @@ export const DayView = () => {
.startOf('day')
.add(option[0].time, 'minute')
.local()
- .format('HH:mm')}
+ .format(isUSCitizen() ? "hh:mm A": "HH:mm")}
{
{hours.map((hour) => (
- {hour.toString().padStart(2, '0')}:00
+ {/* {hour.toString().padStart(2, '0')}:00 */}
+ {convertTimeFormatBasedOnLocality(hour)}
{days.map((day, indexDay) => (
diff --git a/apps/frontend/src/components/launches/filters.tsx b/apps/frontend/src/components/launches/filters.tsx
index e469153d..db21fa5b 100644
--- a/apps/frontend/src/components/launches/filters.tsx
+++ b/apps/frontend/src/components/launches/filters.tsx
@@ -3,6 +3,7 @@ import { useCalendar } from '@gitroom/frontend/components/launches/calendar.cont
import clsx from 'clsx';
import dayjs from 'dayjs';
import { useCallback } from 'react';
+import { isUSCitizen } from './helpers/isuscitizen.utils';
export const Filters = () => {
const week = useCalendar();
@@ -12,30 +13,30 @@ export const Filters = () => {
.year(week.currentYear)
.isoWeek(week.currentWeek)
.day(week.currentDay)
- .format('DD/MM/YYYY')
+ .format(isUSCitizen() ? 'MM/DD/YYYY' :'DD/MM/YYYY')
: week.display === 'week'
? dayjs()
.year(week.currentYear)
.isoWeek(week.currentWeek)
.startOf('isoWeek')
- .format('DD/MM/YYYY') +
+ .format(isUSCitizen() ? 'MM/DD/YYYY' :'DD/MM/YYYY') +
' - ' +
dayjs()
.year(week.currentYear)
.isoWeek(week.currentWeek)
.endOf('isoWeek')
- .format('DD/MM/YYYY')
+ .format(isUSCitizen() ? 'MM/DD/YYYY' :'DD/MM/YYYY')
: dayjs()
.year(week.currentYear)
.month(week.currentMonth)
.startOf('month')
- .format('DD/MM/YYYY') +
+ .format(isUSCitizen() ? 'MM/DD/YYYY' :'DD/MM/YYYY') +
' - ' +
dayjs()
.year(week.currentYear)
.month(week.currentMonth)
.endOf('month')
- .format('DD/MM/YYYY');
+ .format(isUSCitizen() ? 'MM/DD/YYYY' :'DD/MM/YYYY');
const setDay = useCallback(() => {
week.setFilters({
diff --git a/apps/frontend/src/components/launches/helpers/date.picker.tsx b/apps/frontend/src/components/launches/helpers/date.picker.tsx
index 1e1b42c7..38bed701 100644
--- a/apps/frontend/src/components/launches/helpers/date.picker.tsx
+++ b/apps/frontend/src/components/launches/helpers/date.picker.tsx
@@ -3,6 +3,7 @@ import dayjs from 'dayjs';
import { Calendar, TimeInput } from '@mantine/dates';
import { useClickOutside } from '@mantine/hooks';
import { Button } from '@gitroom/react/form/button';
+import { isUSCitizen } from './isuscitizen.utils';
export const DatePicker: FC<{
date: dayjs.Dayjs;
@@ -39,7 +40,7 @@ export const DatePicker: FC<{
onClick={changeShow}
ref={ref}
>
- {date.format('DD/MM/YYYY HH:mm')}
+ {date.format(isUSCitizen() ? 'MM/DD/YYYY hh:mm A' : 'DD/MM/YYYY HH:mm')}