Skip to content

fix(404): locale-aware not-found page #8

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.

Sign up for GitHub

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

Open
abdout wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(404): locale-aware not-found page #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions src/app/[lang]/not-found.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import Link from 'next/link';
import { cookies } from 'next/headers';
import { Button } from '@/components/ui/button';
import { getDictionary } from '@/components/internationalization/dictionaries';
import type { Locale } from '@/components/internationalization/config';
import { i18n, type Locale } from '@/components/internationalization/config';

async function resolveLocale(): Promise<Locale> {
const store = await cookies();
const cookieLocale = store.get('NEXT_LOCALE')?.value;
return (i18n.locales as readonly string[]).includes(cookieLocale ?? '')
? (cookieLocale as Locale)
: i18n.defaultLocale;
}

export default async function NotFound() {
// For not-found pages, we can't reliably get locale from params
// so we'll default to English and handle this gracefully
const dict = await getDictionary('en');
const locale = await resolveLocale();
const dict = await getDictionary(locale);

return (
<div className="flex min-h-screen flex-col items-center justify-center">
Expand All @@ -16,11 +24,11 @@ export default async function NotFound() {
<h2 className="text-2xl font-bold">{dict.errors.notFound}</h2>
</div>
<Button asChild>
<Link href="/en">
<Link href={`/${locale}`}>
{dict.common.home}
</Link>
</Button>
</div>
</div>
);
}
}