From 56ea356723ac4f837dc5730faf23f563dd264683 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 17 Nov 2024 11:04:15 -0600 Subject: [PATCH] refactor(dokploy): update i18next build --- Dockerfile | 1 - apps/dokploy/next-i18next.config.js | 2 -- apps/dokploy/pages/dashboard/settings/appearance.tsx | 4 ++-- apps/dokploy/pages/dashboard/settings/profile.tsx | 3 +-- apps/dokploy/pages/dashboard/settings/server.tsx | 3 +-- apps/dokploy/utils/i18n.ts | 9 +++++++++ 6 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 apps/dokploy/next-i18next.config.js diff --git a/Dockerfile b/Dockerfile index 0c7250d2..838fbe4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ RUN apt-get update && apt-get install -y curl unzip apache2-utils && rm -rf /var COPY --from=build /prod/dokploy/.next ./.next COPY --from=build /prod/dokploy/dist ./dist COPY --from=build /prod/dokploy/next.config.mjs ./next.config.mjs -COPY --from=build /prod/dokploy/next-i18next.config.js ./next-i18next.config.js COPY --from=build /prod/dokploy/next-i18next.config.cjs ./next-i18next.config.cjs COPY --from=build /prod/dokploy/public ./public COPY --from=build /prod/dokploy/package.json ./package.json diff --git a/apps/dokploy/next-i18next.config.js b/apps/dokploy/next-i18next.config.js deleted file mode 100644 index 10977f3e..00000000 --- a/apps/dokploy/next-i18next.config.js +++ /dev/null @@ -1,2 +0,0 @@ -import config from "./next-i18next.config.cjs"; -export default config; diff --git a/apps/dokploy/pages/dashboard/settings/appearance.tsx b/apps/dokploy/pages/dashboard/settings/appearance.tsx index f074f289..209d938c 100644 --- a/apps/dokploy/pages/dashboard/settings/appearance.tsx +++ b/apps/dokploy/pages/dashboard/settings/appearance.tsx @@ -2,13 +2,13 @@ import { AppearanceForm } from "@/components/dashboard/settings/appearance-form" import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; import { appRouter } from "@/server/api/root"; -import { getLocale } from "@/utils/i18n"; +import { getLocale, serverSideTranslations } from "@/utils/i18n"; import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; -import { serverSideTranslations } from "next-i18next/serverSideTranslations"; import React, { type ReactElement } from "react"; import superjson from "superjson"; +import nextI18NextConfig from "../../../next-i18next.config.cjs"; const Page = () => { return ( diff --git a/apps/dokploy/pages/dashboard/settings/profile.tsx b/apps/dokploy/pages/dashboard/settings/profile.tsx index 9303354f..a645a4af 100644 --- a/apps/dokploy/pages/dashboard/settings/profile.tsx +++ b/apps/dokploy/pages/dashboard/settings/profile.tsx @@ -4,11 +4,10 @@ import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; import { appRouter } from "@/server/api/root"; import { api } from "@/utils/api"; -import { getLocale } from "@/utils/i18n"; +import { getLocale, serverSideTranslations } from "@/utils/i18n"; import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; -import { serverSideTranslations } from "next-i18next/serverSideTranslations"; import React, { type ReactElement } from "react"; import superjson from "superjson"; diff --git a/apps/dokploy/pages/dashboard/settings/server.tsx b/apps/dokploy/pages/dashboard/settings/server.tsx index c714acd8..c1d3d548 100644 --- a/apps/dokploy/pages/dashboard/settings/server.tsx +++ b/apps/dokploy/pages/dashboard/settings/server.tsx @@ -3,11 +3,10 @@ import { WebServer } from "@/components/dashboard/settings/web-server"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; import { appRouter } from "@/server/api/root"; -import { getLocale } from "@/utils/i18n"; +import { getLocale, serverSideTranslations } from "@/utils/i18n"; import { IS_CLOUD, validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; -import { serverSideTranslations } from "next-i18next/serverSideTranslations"; import React, { type ReactElement } from "react"; import superjson from "superjson"; diff --git a/apps/dokploy/utils/i18n.ts b/apps/dokploy/utils/i18n.ts index 0c165c4e..4790f1a7 100644 --- a/apps/dokploy/utils/i18n.ts +++ b/apps/dokploy/utils/i18n.ts @@ -4,3 +4,12 @@ export function getLocale(cookies: NextApiRequestCookies) { const locale = cookies.DOKPLOY_LOCALE ?? "en"; return locale; } + +// libs/i18n.js +import { serverSideTranslations as originalServerSideTranslations } from "next-i18next/serverSideTranslations"; +import nextI18NextConfig from "../next-i18next.config.cjs"; + +export const serverSideTranslations = ( + locale: string, + namespaces = ["common"], +) => originalServerSideTranslations(locale, namespaces, nextI18NextConfig);