diff --git a/package.json b/package.json index 0d268e59..9cadfc76 100644 --- a/package.json +++ b/package.json @@ -45,12 +45,10 @@ "electron-squirrel-startup": "^1.0.0", "fastify": "^4.17.0", "file-saver": "^2.0.5", - "i18next": "21.10.0", "immer": "^9.0.19", "lodash": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-i18next": "11.18.6", "react-router-dom": "^6.4.5", "use-immer": "^0.8.1", "zustand": "^4.3.1" diff --git a/src/components/Login/Login.test.tsx b/src/components/Login/Login.test.tsx index e63d0466..5dfac359 100644 --- a/src/components/Login/Login.test.tsx +++ b/src/components/Login/Login.test.tsx @@ -27,19 +27,6 @@ jest.mock("react-router-dom", () => ({ useNavigate: () => mockedUsedNavigate, })) -jest.mock("react-i18next", () => ({ - useTranslation: () => ({ - t: (str: string) => str, - i18n: { - changeLanguage: () => new Promise(() => {}), - }, - }), - initReactI18next: { - type: "3rdParty", - init: () => {}, - }, -})) - describe("", () => { it("should set providerLogin to JiraCloud after clicking on the Jira Cloud Button", async () => { const { container, getByTestId } = render( diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx index 2bef1728..46b52998 100644 --- a/src/components/Login/Login.tsx +++ b/src/components/Login/Login.tsx @@ -1,10 +1,8 @@ -import {Button, Container, Divider, Group, Image, Paper, rgba} from "@mantine/core" +import { Button, Container, Divider, Image, Paper, rgba } from "@mantine/core" import { IconCloud, IconServer } from "@tabler/icons-react" import { ipcRenderer } from "electron" import { useState } from "react" -import { useTranslation } from "react-i18next" import { useNavigate } from "react-router-dom" -import { LanguageSelector } from "../common/LanguageSelector" import { ColorSchemeToggle } from "../common/ColorSchemeToggle" import { JiraCloudLogin } from "./jira-cloud/JiraCloudLogin" import { JiraServerLogin } from "./jira-server/JiraServerLogin" @@ -15,7 +13,6 @@ export function Login() { const navigateTo = useNavigate() const onSuccess = () => navigateTo("/projectsview") const goBack = () => setProviderLogin("") - const { t } = useTranslation("login") const colorScheme = useColorScheme() return ( @@ -39,10 +36,7 @@ export function Login() { borderRadius: theme.radius.lg, })} > - - - - + ) diff --git a/src/components/Login/jira-server/LoginForm.tsx b/src/components/Login/jira-server/LoginForm.tsx index 1240c399..4fe857fa 100644 --- a/src/components/Login/jira-server/LoginForm.tsx +++ b/src/components/Login/jira-server/LoginForm.tsx @@ -1,6 +1,5 @@ import { Button, Group, PasswordInput, Stack, TextInput } from "@mantine/core" import { useForm } from "@mantine/form" -import { useTranslation } from "react-i18next" import { LoginFormValues } from "./LoginFormValues" import { loginToJiraServer } from "./loginToJiraServer" import { getImportMetaEnv } from "../../../get-meta-env"; @@ -12,7 +11,6 @@ export function LoginForm({ goBack: () => void onSuccess: () => void }) { - const { t } = useTranslation("login") const metaEnv = getImportMetaEnv() const form = useForm({ initialValues: { @@ -30,20 +28,20 @@ export function LoginForm({ @@ -62,7 +60,7 @@ export function LoginForm({ Log in diff --git a/src/components/common/LanguageSelector.tsx b/src/components/common/LanguageSelector.tsx deleted file mode 100644 index a16e9efd..00000000 --- a/src/components/common/LanguageSelector.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import { Select } from "@mantine/core" -import { useTranslation } from "react-i18next" - -export function LanguageSelector() { - const { i18n } = useTranslation() - - const handleLanguageChange = (language: string | null) => { - i18n.changeLanguage(language || undefined) - } - - return ( -