Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add i18n support for static texts in components and stuff #862

Merged
merged 6 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions messages/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
trulshj marked this conversation as resolved.
Show resolved Hide resolved
"CustomerCase": {
"customer": "Customer",
"project": "Project",
"duration": "Duration"
}
}
7 changes: 7 additions & 0 deletions messages/no.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"CustomerCase": {
"customer": "Kunde",
"project": "Prosjekt",
"duration": "Varighet"
}
}
7 changes: 7 additions & 0 deletions messages/se.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"CustomerCase": {
"customer": "Kund",
"project": "Projekt",
"duration": "Varaktighet"
}
}
6 changes: 5 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import createNextIntlPlugin from "next-intl/plugin";

const withNextIntl = createNextIntlPlugin();

/** @type {import('next').NextConfig} */
const nextConfig = {
images: {
Expand All @@ -17,4 +21,4 @@ const nextConfig = {
},
};

export default nextConfig;
export default withNextIntl(nextConfig);
106 changes: 106 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@sanity/vision": "^3.39.1",
"negotiator": "^0.6.3",
"next": "^14.2.15",
"next-intl": "^3.24.0",
"next-sanity": "^7.1.4",
"next-sanity-image": "^6.1.1",
"react": "^18.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
export const dynamic = "force-dynamic";

type Props = {
params: { lang: string; path: string[] };
params: { locale: string; path: string[] };
};

function seoDataFromPageData(
Expand All @@ -52,7 +52,7 @@ function seoDataFromPageData(

export async function generateMetadata({ params }: Props): Promise<Metadata> {
const { perspective } = getDraftModeInfo();
const language = params.lang;
const language = params.locale;
const pageData = await fetchPageDataFromParams({
language,
path: params.path,
Expand All @@ -71,12 +71,12 @@ const Page404 = (
);

async function Page({ params }: Props) {
const { lang, path } = params;
const { locale, path } = params;

const { perspective, isDraftMode } = getDraftModeInfo();

const pageData = await fetchPageDataFromParams({
language: lang,
language: locale,
path,
perspective: perspective ?? "published",
hostname: headers().get("host"),
Expand All @@ -91,7 +91,7 @@ async function Page({ params }: Props) {
return (
<>
<PageHeader
language={lang}
language={locale}
pathTitles={pathTitles}
pathTranslations={pathTranslations}
showBreadcrumbs={true}
Expand All @@ -105,7 +105,7 @@ async function Page({ params }: Props) {
{queryResponse.data?.sections?.map((section, index) => (
<SectionRenderer
key={section._key}
language={lang}
language={locale}
section={section}
isDraftMode={isDraftMode}
initialData={queryResponse}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import localFont from "next/font/local";
import { draftMode } from "next/headers";
import { notFound } from "next/navigation";
import { NextIntlClientProvider } from "next-intl";
import { getMessages } from "next-intl/server";

import Footer from "src/components/navigation/footer/Footer";
import FooterPreview from "src/components/navigation/footer/FooterPreview";
import SkipToMain from "src/components/skipToMain/SkipToMain";
import { Locale, routing } from "src/i18n/routing";
import { getDraftModeInfo } from "src/utils/draftmode";
import { BrandAssets } from "studio/lib/interfaces/brandAssets";
import { CompanyInfo } from "studio/lib/interfaces/companyDetails";
Expand All @@ -21,7 +25,6 @@ import {
SOME_PROFILES_QUERY,
} from "studio/lib/queries/siteSettings";
import { loadStudioQuery } from "studio/lib/store";

import "src/styles/global.css";

const fontBrittiSans = localFont({
Expand All @@ -37,9 +40,15 @@ export default async function Layout({
}: Readonly<{
children: React.ReactNode;
params: {
lang: string;
locale: string;
};
}>) {
if (!routing.locales.includes(params.locale as Locale)) {
notFound();
}

const messages = await getMessages();

const { perspective, isDraftMode } = getDraftModeInfo();

const [
Expand All @@ -51,7 +60,7 @@ export default async function Layout({
] = await Promise.all([
loadStudioQuery<Navigation>(
NAV_QUERY,
{ language: params.lang },
{ language: params.locale },
{ perspective },
),
loadStudioQuery<CompanyInfo>(COMPANY_INFO_QUERY, {}, { perspective }),
Expand All @@ -62,7 +71,7 @@ export default async function Layout({
),
loadStudioQuery<LegalDocument[]>(
LEGAL_DOCUMENTS_BY_LANG_QUERY,
{ language: params.lang },
{ language: params.locale },
{ perspective },
),
loadStudioQuery<BrandAssets>(BRAND_ASSETS_QUERY, {}, { perspective }),
Expand All @@ -73,29 +82,31 @@ export default async function Layout({
const hasFooterData = hasNavData && initialNav.data.footer;

return (
<html lang={params.lang}>
<html lang={params.locale}>
<body className={fontBrittiSans.variable}>
<SkipToMain />
{children}
{hasFooterData && isDraftMode ? (
<FooterPreview
initialNav={initialNav}
initialCompanyInfo={initialCompanyInfo}
initialBrandAssets={initialBrandAssets}
initialSoMe={initialSoMe}
initialLegal={initialLegal}
language={params.lang}
/>
) : (
<Footer
navigationData={initialNav.data}
legalData={initialLegal.data}
companyInfo={initialCompanyInfo.data}
brandAssets={initialBrandAssets.data}
soMeData={initialSoMe.data}
/>
)}
{draftMode().isEnabled && <LiveVisualEditing />}
<NextIntlClientProvider messages={messages}>
<SkipToMain />
{children}
{hasFooterData && isDraftMode ? (
<FooterPreview
initialNav={initialNav}
initialCompanyInfo={initialCompanyInfo}
initialBrandAssets={initialBrandAssets}
initialSoMe={initialSoMe}
initialLegal={initialLegal}
language={params.locale}
/>
) : (
<Footer
navigationData={initialNav.data}
legalData={initialLegal.data}
companyInfo={initialCompanyInfo.data}
brandAssets={initialBrandAssets.data}
soMeData={initialSoMe.data}
/>
)}
{draftMode().isEnabled && <LiveVisualEditing />}
</NextIntlClientProvider>
</body>
</html>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
const { data: landingPage } = await loadStudioQuery<PageBuilder | null>(
LANDING_PAGE_QUERY,
{
language: params.lang,
language: params.locale,
},
);
return generateMetadataFromSeo(landingPage?.seo ?? null, params.lang);
return generateMetadataFromSeo(landingPage?.seo ?? null, params.locale);
}

const navigationManagerLink = {
Expand All @@ -35,15 +35,15 @@ const navigationManagerLink = {
};

type Props = {
params: { lang: string };
params: { locale: string };
};

const Home = async ({ params }: Props) => {
const { perspective, isDraftMode } = getDraftModeInfo();

const initialLandingPage = await loadStudioQuery<PageBuilder | null>(
LANDING_PAGE_QUERY,
{ language: params.lang },
{ language: params.locale },
{ perspective },
);

Expand Down Expand Up @@ -72,7 +72,7 @@ const Home = async ({ params }: Props) => {
return (
<>
<PageHeader
language={params.lang}
language={params.locale}
pathTranslations={pathTranslations}
pathTitles={[]}
showBreadcrumbs={false}
Expand All @@ -81,7 +81,7 @@ const Home = async ({ params }: Props) => {
{initialLandingPage.data.sections.map((section, index) => (
<SectionRenderer
key={section._key}
language={params.lang}
language={params.locale}
section={section}
isDraftMode={isDraftMode}
initialData={initialLandingPage}
Expand Down
Loading