Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Kalenterin viivafiksaus
  • Loading branch information
taahol committed Nov 25, 2023
2 parents f64a6b6 + 3f0afbc commit 1e4da8a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const Event: FC<{ event: Event }> = ({ event }) => {
const formatWithTime = (start: Date, end: Date) => {
const startFormatted = format(start, 'HH:mm', { locale: fi });
const endFormatted = format(end, 'HH:mm', { locale: fi });
return `kello ${startFormatted} &ndash; ${endFormatted}`;
return <>kello {startFormatted} &ndash; {endFormatted}</>;
};

const formatWithoutTime = (start: Date, end: Date) => {
Expand All @@ -112,7 +112,7 @@ const formatWithoutTime = (start: Date, end: Date) => {

if (startFormatted === endFormatted) return 'Koko päivä';

return `${startFormatted} &ndash; ${endFormatted}`;
return <>{startFormatted} &ndash; {endFormatted}</>;
};

export default Calendar;

0 comments on commit 1e4da8a

Please sign in to comment.