diff --git a/app/i18n/client.ts b/app/i18n/client.ts index 904e1f1..abbfb25 100644 --- a/app/i18n/client.ts +++ b/app/i18n/client.ts @@ -10,7 +10,7 @@ import { useTranslation as useTranslationOrg, } from "react-i18next" -import { cookieName, getOptions, languages } from "./settings" +import { LocaleTypes, cookieName, getOptions, languages } from "./settings" const runsOnServerSide = typeof window === "undefined" @@ -33,7 +33,11 @@ i18next preload: runsOnServerSide ? languages : [], }) -export function useTranslation(lng: string, ns: string, options = {}) { +export function useTranslation( + lng: LocaleTypes | string, + ns: string, + options = {} +) { const [cookies, setCookie] = useCookies([cookieName]) const ret = useTranslationOrg(ns, options) const { i18n } = ret diff --git a/app/i18n/locales/en/resources-page.json b/app/i18n/locales/en/resources-page.json index 0db3279..0967ef4 100644 --- a/app/i18n/locales/en/resources-page.json +++ b/app/i18n/locales/en/resources-page.json @@ -1,3 +1 @@ -{ - -} +{} diff --git a/components/project/project-detail-tags.tsx b/components/project/project-detail-tags.tsx index b655f54..d15877e 100644 --- a/components/project/project-detail-tags.tsx +++ b/components/project/project-detail-tags.tsx @@ -7,7 +7,6 @@ import { ProjectFilter, } from "@/state/useProjectFiltersState" -import { LangProps } from "@/types/common" import { ProjectInterface } from "@/lib/types" import { useTranslation } from "@/app/i18n/client" import { LocaleTypes } from "@/app/i18n/settings" diff --git a/middleware.ts b/middleware.ts index 64d2252..bad340f 100644 --- a/middleware.ts +++ b/middleware.ts @@ -1,7 +1,7 @@ import { NextResponse } from "next/server" import acceptLanguage from "accept-language" -import { cookieName, fallbacklang, languages } from "./app/i18n/settings" +import { cookieName, fallbackLng, languages } from "./app/i18n/settings" acceptLanguage.languages(languages as any) @@ -16,7 +16,7 @@ export function middleware(req: any) { if (req.cookies.has(cookieName)) lang = acceptLanguage.get(req.cookies.get(cookieName).value) if (!lang) lang = acceptLanguage.get(req.headers.get("Accept-Language")) - if (!lang) lang = fallbacklang + if (!lang) lang = fallbackLng // Keep the file from public folder if (PUBLIC_FILE.test(req.nextUrl.pathname)) { diff --git a/types/common.ts b/types/common.ts index 236062a..ef48f65 100644 --- a/types/common.ts +++ b/types/common.ts @@ -2,6 +2,6 @@ import { LocaleTypes } from "@/app/i18n/settings" export interface LangProps { params: { - lang?: LocaleTypes + lang: LocaleTypes } }