diff --git a/app/messages/components/conversation.tsx b/app/messages/components/conversation.tsx index 888188b..d12f989 100644 --- a/app/messages/components/conversation.tsx +++ b/app/messages/components/conversation.tsx @@ -42,14 +42,14 @@ export default function Conversation() { {(!isPreviousMessageFromSameSender || !shouldGroupMessages) && (
- {new Date(message.sentAt).toLocaleDateString("fr-FR", { + {new Date(message.sentAt).toLocaleDateString("en-US", { weekday: "long", day: "2-digit", month: "short", })} - {new Date(message.sentAt).toLocaleTimeString("fr-FR", { + {new Date(message.sentAt).toLocaleTimeString("en-US", { hour: "2-digit", minute: "2-digit", })} diff --git a/app/messages/components/conversations-list.tsx b/app/messages/components/conversations-list.tsx index 65148b6..8450c18 100644 --- a/app/messages/components/conversations-list.tsx +++ b/app/messages/components/conversations-list.tsx @@ -43,7 +43,7 @@ function formatMessageDate(date: Date): string { const isToday = diff.days > -1; if (isToday) { - return messageDate.toFormat("HH:mm", { locale: "fr-FR" }); + return messageDate.toFormat("HH:mm", { locale: "en-US" }); } const isDuringLastWeek = diff.days > -8; @@ -51,5 +51,5 @@ function formatMessageDate(date: Date): string { return messageDate.weekdayLong; } - return messageDate.toFormat("dd/MM/yyyy", { locale: "fr-FR" }); + return messageDate.toFormat("dd/MM/yyyy", { locale: "en-US" }); } diff --git a/app/messages/pages/messages/[recipient].tsx b/app/messages/pages/messages/[recipient].tsx index 3db6aea..98444c3 100644 --- a/app/messages/pages/messages/[recipient].tsx +++ b/app/messages/pages/messages/[recipient].tsx @@ -14,10 +14,11 @@ const ConversationPage: BlitzPage = () => { const router = useRouter(); const recipient = decodeURIComponent(router.params.recipient); + const pageTitle = `Messages with ${recipient}`; const conversation = useConversation(recipient)[0]; return ( - <> +
@@ -31,18 +32,6 @@ const ConversationPage: BlitzPage = () => { Loading messages with {recipient}
}> - - ); -}; - -ConversationPage.getLayout = function ConversationLayout(page) { - const router = useRouter(); - const recipient = decodeURIComponent(router.params.recipient); - const pageTitle = `Messages with ${recipient}`; - - return ( - - {page} ); }; diff --git a/app/phone-calls/components/phone-calls-list.tsx b/app/phone-calls/components/phone-calls-list.tsx index e5b721f..fe0bc21 100644 --- a/app/phone-calls/components/phone-calls-list.tsx +++ b/app/phone-calls/components/phone-calls-list.tsx @@ -15,7 +15,7 @@ export default function PhoneCallsList() { return (
  • {recipient}
    -
    {new Date(phoneCall.createdAt).toLocaleString("fr-FR")}
    +
    {new Date(phoneCall.createdAt).toLocaleString("en-US")}
  • ); })}