From f555e819afa744cb221009e458d32f55671b37e9 Mon Sep 17 00:00:00 2001 From: Timur Carpeev Date: Fri, 15 Jul 2022 11:46:59 +0200 Subject: [PATCH] Named months (#2130) * Use named moths to avoid ambiguity * Change format of gift card expiration --- .../Channel/ChannelAvailabilityItemContent.tsx | 4 ++-- src/components/ChannelsAvailabilityCard/utils.ts | 8 ++++---- src/components/VisibilityCard/VisibilityCard.tsx | 2 +- .../GiftCardCreateExpirySelect.tsx | 2 +- .../GiftCardUpdateInfoCardContent.tsx | 2 +- src/pages/components/PageDetailsPage/PageDetailsPage.tsx | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx index a5f564d56..fd91f5d66 100644 --- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx +++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx @@ -54,7 +54,7 @@ const ChannelContent: React.FC = ({ const intl = useIntl(); const classes = useStyles({}); - const todayDate = localizeDate(new Date(dateNow).toISOString(), "YYYY-MM-DD"); + const todayDate = localizeDate(new Date(dateNow).toISOString()); const visibleMessage = (date: string) => intl.formatMessage( @@ -64,7 +64,7 @@ const ChannelContent: React.FC = ({ description: "date", }, { - date: localizeDate(date, "L"), + date: localizeDate(date), }, ); const formErrors = getFormErrors( diff --git a/src/components/ChannelsAvailabilityCard/utils.ts b/src/components/ChannelsAvailabilityCard/utils.ts index 6b6be4e58..3f65db33c 100644 --- a/src/components/ChannelsAvailabilityCard/utils.ts +++ b/src/components/ChannelsAvailabilityCard/utils.ts @@ -29,7 +29,7 @@ export const getChannelsAvailabilityMessages = ({ description: "channel publication date", }, { - date: localizeDate(currVal.publicationDate, "L"), + date: localizeDate(currVal.publicationDate), }, ) : currVal.publicationDate @@ -40,7 +40,7 @@ export const getChannelsAvailabilityMessages = ({ description: "channel publication date", }, { - date: localizeDate(currVal.publicationDate, "L"), + date: localizeDate(currVal.publicationDate), }, ) : currVal.isPublished @@ -66,7 +66,7 @@ export const getChannelsAvailabilityMessages = ({ description: "product available for purchase date", }, { - date: localizeDate(currVal.availableForPurchase, "L"), + date: localizeDate(currVal.availableForPurchase), }, ), hiddenSecondLabel: intl.formatMessage( @@ -76,7 +76,7 @@ export const getChannelsAvailabilityMessages = ({ description: "product publication date label", }, { - date: localizeDate(currVal.publicationDate, "L"), + date: localizeDate(currVal.publicationDate), }, ), setAvailabilityDateLabel: intl.formatMessage({ diff --git a/src/components/VisibilityCard/VisibilityCard.tsx b/src/components/VisibilityCard/VisibilityCard.tsx index e8ba96728..88121256a 100644 --- a/src/components/VisibilityCard/VisibilityCard.tsx +++ b/src/components/VisibilityCard/VisibilityCard.tsx @@ -115,7 +115,7 @@ export const VisibilityCard: React.FC = props => { description: "date", }, { - date: localizeDate(date, "L"), + date: localizeDate(date), }, ); diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx index 027b982ea..6b48b5a85 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx @@ -125,7 +125,7 @@ const GiftCardCreateExpirySelect: React.FC = ({ currentDate, expiryPeriodType, expiryPeriodAmount, - )?.format("L")} + )?.format("ll")} diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx index 195273255..1fbd37b05 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx @@ -115,7 +115,7 @@ const GiftCardUpdateInfoCardContent: React.FC = () => { return ( <>