Update date format

aelassas · Apr 18, 2024 · 1a598cb · 1a598cb
1 parent b29fe0b
commit 1a598cb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/backend/src/components/BookingList.tsx b/backend/src/components/BookingList.tsx
@@ -482,7 +482,7 @@ const BookingList = ({
 
   const _fr = language === 'fr'
   const _locale = _fr ? dfnsFR : dfnsENUS
-  const _format = _fr ? 'eee d LLL yyyy kk:mm' : 'eee, d LLL yyyy, kk:mm'
+  const _format = _fr ? 'eee d LLL yyyy kk:mm' : 'eee, d LLL yyyy, p'
   const bookingDetailHeight = env.AGENCY_IMAGE_HEIGHT + 10
 
   return (

diff --git a/frontend/src/components/BookingList.tsx b/frontend/src/components/BookingList.tsx
@@ -397,7 +397,7 @@ const BookingList = ({
 
   const _fr = language === 'fr'
   const _locale = _fr ? dfnsFR : dfnsENUS
-  const _format = _fr ? 'eee d LLL yyyy kk:mm' : 'eee, d LLL yyyy, kk:mm'
+  const _format = _fr ? 'eee d LLL yyyy kk:mm' : 'eee, d LLL yyyy, p'
   const bookingDetailHeight = env.AGENCY_IMAGE_HEIGHT + 10
 
   return (

diff --git a/mobile/components/Booking.tsx b/mobile/components/Booking.tsx
@@ -23,7 +23,6 @@ interface BookingProps {
   onCancel: () => void
 }
 
-const _format = 'eee d LLLL yyyy kk:mm'
 const iconSize = 24
 const iconColor = '#000'
 const extraIconColor = '#1f9201'
@@ -46,6 +45,9 @@ const Booking = ({
   today.setSeconds(0)
   today.setMilliseconds(0)
 
+  const _fr = movininHelper.isFrench(language)
+  const _format = _fr ? 'eee d LLL yyyy kk:mm' : 'eee, d LLL yyyy, p'
+
   return (
     <View key={booking._id} style={styles.bookingContainer}>
       <View style={styles.booking}>

diff --git a/mobile/screens/Checkout.tsx b/mobile/screens/Checkout.tsx
@@ -621,8 +621,8 @@ const CheckoutScreen = ({ navigation, route }: NativeStackScreenProps<StackParam
 
   const iconSize = 18
   const iconColor = '#000'
-  const _fr = language === 'fr'
-  const _format = `eee d LLLL yyyy ${_fr ? 'kk:mm' : 'p'}`
+  const _fr = movininHelper.isFrench(language)
+  const _format = _fr ? 'eee d LLL yyyy kk:mm' : 'eee, d LLL yyyy, p'
 
   return (
     <Master style={styles.master} navigation={navigation} onLoad={onLoad} reload={reload} route={route}>