From 1579694d023e431dd8c7f0fd060fdef5ad26bd27 Mon Sep 17 00:00:00 2001 From: Caleb Alldrin Date: Mon, 7 Oct 2024 12:44:23 -0700 Subject: [PATCH] Fix amerstand in welcome message --- src/components/Dashboard/Welcome/Welcome.tsx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/components/Dashboard/Welcome/Welcome.tsx b/src/components/Dashboard/Welcome/Welcome.tsx index 3ee6398e4..61bf2d9aa 100644 --- a/src/components/Dashboard/Welcome/Welcome.tsx +++ b/src/components/Dashboard/Welcome/Welcome.tsx @@ -15,18 +15,12 @@ const Welcome = ({ firstName }: Props): ReactElement => { const { appName } = useGetAppSettings(); const currentHour = today.hour; - let greeting = firstName - ? t('Good Evening, {{ firstName }}.', { firstName }) - : t('Good Evening,'); + let greeting = t('Good Evening,') + (firstName ? ` ${firstName}.` : ''); if (currentHour < 12) { - greeting = firstName - ? t('Good Morning, {{ firstName }}.', { firstName }) - : t('Good Morning,'); + greeting = t('Good Morning,') + (firstName ? ` ${firstName}.` : ''); } else if (currentHour < 18) { - greeting = firstName - ? t('Good Afternoon, {{ firstName }}.', { firstName }) - : t('Good Afternoon,'); + greeting = t('Good Afternoon,') + (firstName ? ` ${firstName}.` : ''); } return (