From 31a0754d21c208db409fe27cd48be6ea8b3921a5 Mon Sep 17 00:00:00 2001
From: rjmacarthy <richardmacarthy@hotmail.com>
Date: Tue, 24 Jan 2023 14:46:47 +0000
Subject: [PATCH] Rename function to getTypeSafei18nKey

---
 website/src/components/Dashboard/TaskOption.tsx        | 6 +++---
 website/src/components/Tasks/CreateTask.tsx            | 4 ++--
 website/src/components/Tasks/Task/Task.tsx             | 6 +++---
 website/src/components/Tasks/TaskHeader/TaskHeader.tsx | 6 +++---
 website/src/lib/i18n.ts                                | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/website/src/components/Dashboard/TaskOption.tsx b/website/src/components/Dashboard/TaskOption.tsx
index fcba8b9d..3497d14c 100644
--- a/website/src/components/Dashboard/TaskOption.tsx
+++ b/website/src/components/Dashboard/TaskOption.tsx
@@ -14,7 +14,7 @@ import { HelpCircle } from "lucide-react";
 import Link from "next/link";
 import { useTranslation } from "next-i18next";
 import { useMemo } from "react";
-import { normalizei18nKey } from "src/lib/i18n";
+import { getTypeSafei18nKey } from "src/lib/i18n";
 import { TaskType } from "src/types/Task";
 
 import { TaskCategory, TaskCategoryLabels, TaskInfo, TaskInfos } from "../Tasks/TaskTypes";
@@ -63,8 +63,8 @@ export const TaskOption = ({ content }: TasksOptionProps) => {
                     className="flex flex-col justify-between h-full"
                   >
                     <Flex className="p-6 pb-10" flexDir="column" gap="3">
-                      <Heading size="md">{t(normalizei18nKey(`tasks:${item.id}.label`))}</Heading>
-                      <Text size="sm">{t(normalizei18nKey(`tasks:${item.id}.desc`))}</Text>
+                      <Heading size="md">{t(getTypeSafei18nKey(`tasks:${item.id}.label`))}</Heading>
+                      <Text size="sm">{t(getTypeSafei18nKey(`tasks:${item.id}.desc`))}</Text>
                     </Flex>
                     <Text
                       fontWeight="bold"
diff --git a/website/src/components/Tasks/CreateTask.tsx b/website/src/components/Tasks/CreateTask.tsx
index 3e34b715..36493e27 100644
--- a/website/src/components/Tasks/CreateTask.tsx
+++ b/website/src/components/Tasks/CreateTask.tsx
@@ -6,7 +6,7 @@ import { TrackedTextarea } from "src/components/Survey/TrackedTextarea";
 import { TwoColumnsWithCards } from "src/components/Survey/TwoColumnsWithCards";
 import { TaskSurveyProps } from "src/components/Tasks/Task";
 import { TaskHeader } from "src/components/Tasks/TaskHeader";
-import { normalizei18nKey } from "src/lib/i18n";
+import { getTypeSafei18nKey } from "src/lib/i18n";
 
 export const CreateTask = ({
   task,
@@ -49,7 +49,7 @@ export const CreateTask = ({
           <Stack spacing="4">
             {!!i18n.exists(`task.${taskType.id}.instruction`) && (
               <Text fontSize="xl" fontWeight="bold" color={titleColor}>
-                {t(normalizei18nKey(`${taskType.id}.instruction`))}
+                {t(getTypeSafei18nKey(`${taskType.id}.instruction`))}
               </Text>
             )}
             <TrackedTextarea
diff --git a/website/src/components/Tasks/Task/Task.tsx b/website/src/components/Tasks/Task/Task.tsx
index 73ab4998..ae82ef97 100644
--- a/website/src/components/Tasks/Task/Task.tsx
+++ b/website/src/components/Tasks/Task/Task.tsx
@@ -7,7 +7,7 @@ import { LabelTask } from "src/components/Tasks/LabelTask";
 import { TaskCategory, TaskInfo, TaskInfos } from "src/components/Tasks/TaskTypes";
 import { UnchangedWarning } from "src/components/Tasks/UnchangedWarning";
 import { post } from "src/lib/api";
-import { normalizei18nKey } from "src/lib/i18n";
+import { getTypeSafei18nKey } from "src/lib/i18n";
 import { TaskContent, TaskReplyValidity } from "src/types/Task";
 import useSWRMutation from "swr/mutation";
 
@@ -160,8 +160,8 @@ export const Task = ({ frontendId, task, trigger, mutate }) => {
       />
       <UnchangedWarning
         show={showUnchangedWarning}
-        title={t(normalizei18nKey(`${taskType.id}.unchanged_title`)) || t("default.unchanged_title")}
-        message={t(normalizei18nKey(`${taskType.id}.unchanged_message`)) || t("default.unchanged_message")}
+        title={t(getTypeSafei18nKey(`${taskType.id}.unchanged_title`)) || t("default.unchanged_title")}
+        message={t(getTypeSafei18nKey(`${taskType.id}.unchanged_message`)) || t("default.unchanged_message")}
         continueButtonText={"Continue anyway"}
         onClose={() => setShowUnchangedWarning(false)}
         onContinueAnyway={() => {
diff --git a/website/src/components/Tasks/TaskHeader/TaskHeader.tsx b/website/src/components/Tasks/TaskHeader/TaskHeader.tsx
index 651cf9d2..c4095eb8 100644
--- a/website/src/components/Tasks/TaskHeader/TaskHeader.tsx
+++ b/website/src/components/Tasks/TaskHeader/TaskHeader.tsx
@@ -2,7 +2,7 @@ import { HStack, IconButton, Link, Stack, Text, useColorModeValue } from "@chakr
 import { HelpCircle } from "lucide-react";
 import { useTranslation } from "next-i18next";
 import type { TaskInfo } from "src/components/Tasks/TaskTypes";
-import { normalizei18nKey } from "src/lib/i18n";
+import { getTypeSafei18nKey } from "src/lib/i18n";
 
 interface TaskHeaderProps {
   /**
@@ -22,14 +22,14 @@ const TaskHeader = ({ taskType }: TaskHeaderProps) => {
     <Stack spacing="1">
       <HStack>
         <Text fontSize="xl" fontWeight="bold" color={titleColor}>
-          {t(normalizei18nKey(`${taskType.id}.label`))}
+          {t(getTypeSafei18nKey(`${taskType.id}.label`))}
         </Text>
         <Link href={taskType.help_link} isExternal>
           <IconButton variant="ghost" aria-label="More Information" icon={<HelpCircle size="1em" />} />
         </Link>
       </HStack>
       <Text fontSize="md" color={labelColor}>
-        {t(normalizei18nKey(`${taskType.id}.overview`))}
+        {t(getTypeSafei18nKey(`${taskType.id}.overview`))}
       </Text>
     </Stack>
   );
diff --git a/website/src/lib/i18n.ts b/website/src/lib/i18n.ts
index 630e11f3..72712d27 100644
--- a/website/src/lib/i18n.ts
+++ b/website/src/lib/i18n.ts
@@ -1 +1 @@
-export const normalizei18nKey = (key: string) => key as unknown as TemplateStringsArray;
+export const getTypeSafei18nKey = (key: string) => key as unknown as TemplateStringsArray;