refactor: standardize translation usage across components and pages by removing specific namespace references

This commit is contained in:
Mauricio Siu
2025-03-15 21:38:49 -06:00
parent 0bc2734925
commit 7f2ebab66c
84 changed files with 1533 additions and 1548 deletions

View File

@@ -72,13 +72,13 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
} catch (_error) {
return {
props: {
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -114,7 +114,7 @@ export async function getServerSideProps(
return {
props: {
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -66,7 +66,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -37,7 +37,7 @@ export async function getServerSideProps(
return {
props: {
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -55,7 +55,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -62,7 +62,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -53,7 +53,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -60,7 +60,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -54,7 +54,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -10,72 +10,72 @@ import type { ReactElement } from "react";
import superjson from "superjson";
const Page = () => {
return (
<div className="flex flex-col gap-4 w-full">
<ShowGitProviders />
</div>
);
return (
<div className="flex flex-col gap-4 w-full">
<ShowGitProviders />
</div>
);
};
export default Page;
Page.getLayout = (page: ReactElement) => {
return <DashboardLayout metaName="Git Providers">{page}</DashboardLayout>;
return <DashboardLayout metaName="Git Providers">{page}</DashboardLayout>;
};
export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
permanent: true,
destination: "/",
},
};
}
const { req, res } = ctx;
const locale = await getLocale(req.cookies);
const helpers = createServerSideHelpers({
router: appRouter,
ctx: {
req: req as any,
res: res as any,
db: null as any,
session: session as any,
user: user as any,
},
transformer: superjson,
});
await helpers.user.get.prefetch();
try {
await helpers.project.all.prefetch();
await helpers.settings.isCloud.prefetch();
if (user.role === "member") {
const userR = await helpers.user.one.fetch({
userId: user.id,
});
const { user, session } = await validateRequest(ctx.req);
if (!user) {
return {
redirect: {
permanent: true,
destination: "/",
},
};
}
const { req, res } = ctx;
const locale = await getLocale(req.cookies);
const helpers = createServerSideHelpers({
router: appRouter,
ctx: {
req: req as any,
res: res as any,
db: null as any,
session: session as any,
user: user as any,
},
transformer: superjson,
});
await helpers.user.get.prefetch();
try {
await helpers.project.all.prefetch();
await helpers.settings.isCloud.prefetch();
if (user.role === "member") {
const userR = await helpers.user.one.fetch({
userId: user.id,
});
if (!userR?.canAccessToGitProviders) {
return {
redirect: {
permanent: true,
destination: "/",
},
};
}
}
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
},
};
} catch (_error) {
return {
props: {
...(await serverSideTranslations(locale, ["common", "settings"])),
},
};
}
if (!userR?.canAccessToGitProviders) {
return {
redirect: {
permanent: true,
destination: "/",
},
};
}
}
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale)),
},
};
} catch (_error) {
return {
props: {
...(await serverSideTranslations(locale)),
},
};
}
}

View File

@@ -216,7 +216,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -54,7 +54,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -66,7 +66,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -53,7 +53,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -115,7 +115,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -62,7 +62,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -69,13 +69,13 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
} catch (_error) {
return {
props: {
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -57,7 +57,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "settings"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -72,13 +72,13 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
} catch (_error) {
return {
props: {
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -72,13 +72,13 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
} catch (_error) {
return {
props: {
...(await serverSideTranslations(locale, ["common", "home"])),
...(await serverSideTranslations(locale)),
},
};
}

View File

@@ -56,7 +56,7 @@ interface Props {
}
export default function Home({ IS_CLOUD }: Props) {
const router = useRouter();
const { t } = useTranslation("auth");
const { t } = useTranslation();
const [isLoginLoading, setIsLoginLoading] = useState(false);
const [isTwoFactorLoading, setIsTwoFactorLoading] = useState(false);
@@ -150,9 +150,7 @@ export default function Home({ IS_CLOUD }: Props) {
if (error) {
toast.error(error.message);
setError(
error.message || t("auth.backupCodeVerificationError"),
);
setError(error.message || t("auth.backupCodeVerificationError"));
return;
}
@@ -178,7 +176,8 @@ export default function Home({ IS_CLOUD }: Props) {
}
} catch (error) {
toast.error(t("auth.githubSignInError"), {
description: error instanceof Error ? error.message : t("auth.unknownError"),
description:
error instanceof Error ? error.message : t("auth.unknownError"),
});
} finally {
setIsGithubLoading(false);
@@ -198,7 +197,8 @@ export default function Home({ IS_CLOUD }: Props) {
}
} catch (error) {
toast.error(t("auth.googleSignInError"), {
description: error instanceof Error ? error.message : t("auth.unknownError"),
description:
error instanceof Error ? error.message : t("auth.unknownError"),
});
} finally {
setIsGoogleLoading(false);
@@ -517,7 +517,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
return {
props: {
hasAdmin,
...(await serverSideTranslations(locale, ["auth"])),
...(await serverSideTranslations(locale)),
},
};
}