mohs/sass-mohfarawati
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fix request locale resolution in site pages
CI / quality (push) Waiting to run
Details

Browse Source
This commit is contained in:
MOH
2026-03-15 08:20:39 +01:00
parent c18128c965
commit 288e4b37d7
10 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/[locale]/(site)/portfolio/[slug]/page.tsx
+9 -10
View File
@@ -1,5 +1,5 @@
import type { Metadata } from "next";
import { getTranslations } from "next-intl/server";
import { getLocale, getTranslations } from "next-intl/server";
import { notFound } from "next/navigation";
import { Container } from "@/components/layout/container";
@@ -7,7 +7,7 @@ import { PageHero } from "@/components/layout/page-hero";
import { PortfolioProjectDetail } from "@/components/site/portfolio-project-detail";
import { getSiteSettings } from "@/lib/app-config";
import { buildLocalizedMetadata } from "@/lib/metadata";
import { FALLBACK_LOCALE, resolveLocale } from "@/lib/locale";
import { resolveLocale } from "@/lib/locale";
import {
getLocalizedValue,
getPublishedPortfolioProjectBySlug,
@@ -23,8 +23,9 @@ type PortfolioItemPageProps = {
export const dynamic = "force-dynamic";
export async function generateMetadata({ params }: PortfolioItemPageProps): Promise<Metadata> {
const { locale, slug } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const { slug } = await params;
const siteSettings = await getSiteSettings();
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
const item = await getPublishedPortfolioProjectBySlug(slug);
if (!item) {
@@ -47,18 +48,16 @@ export async function generateMetadata({ params }: PortfolioItemPageProps): Prom
export default async function PortfolioItemPage({
params,
}: PortfolioItemPageProps) {
const { locale, slug } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const { slug } = await params;
const siteSettings = await getSiteSettings();
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
const item = await getPublishedPortfolioProjectBySlug(slug);
if (!item) {
notFound();
}
const [t, siteSettings] = await Promise.all([
getTranslations({ locale: localeKey, namespace: "portfolioDetail" }),
getSiteSettings(),
]);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioDetail" });
return (
<>
app/[locale]/(site)/portfolio/category/[slug]/page.tsx
+9 -8
View File
@@ -1,5 +1,5 @@
import type { Metadata } from "next";
import { getTranslations } from "next-intl/server";
import { getLocale, getTranslations } from "next-intl/server";
import { notFound } from "next/navigation";
import { Container } from "@/components/layout/container";
@@ -8,7 +8,7 @@ import { PortfolioCategoryFilter } from "@/components/site/portfolio-category-fi
import { PortfolioProjectGrid } from "@/components/site/portfolio-project-grid";
import { getSiteSettings } from "@/lib/app-config";
import { buildLocalizedMetadata } from "@/lib/metadata";
import { FALLBACK_LOCALE, resolveLocale } from "@/lib/locale";
import { resolveLocale } from "@/lib/locale";
import {
getActivePortfolioCategories,
getActivePortfolioCategoryBySlug,
@@ -26,8 +26,9 @@ type PortfolioCategoryPageProps = {
export const dynamic = "force-dynamic";
export async function generateMetadata({ params }: PortfolioCategoryPageProps): Promise<Metadata> {
const { locale, slug } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const { slug } = await params;
const siteSettings = await getSiteSettings();
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioPage" });
const category = await getActivePortfolioCategoryBySlug(slug);
@@ -51,15 +52,15 @@ export async function generateMetadata({ params }: PortfolioCategoryPageProps):
export default async function PortfolioCategoryPage({
params,
}: PortfolioCategoryPageProps) {
const { locale, slug } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const [t, siteSettings, categories, category, projects] = await Promise.all([
getTranslations({ locale: localeKey, namespace: "portfolioPage" }),
const { slug } = await params;
const [siteSettings, categories, category, projects] = await Promise.all([
getSiteSettings(),
getActivePortfolioCategories(),
getActivePortfolioCategoryBySlug(slug),
getPublishedPortfolioProjects({ categorySlug: slug }),
]);
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioPage" });
if (!category) {
notFound();
app/[locale]/(site)/portfolio/category/page.tsx
+4 -3
View File
@@ -1,7 +1,8 @@
import { getLocale } from "next-intl/server";
import { permanentRedirect } from "next/navigation";
import { getSiteSettings } from "@/lib/app-config";
import { FALLBACK_LOCALE, getLocalizedPath, resolveLocale } from "@/lib/locale";
import { getLocalizedPath, resolveLocale } from "@/lib/locale";
type PortfolioCategoryIndexPageProps = {
params: Promise<{
@@ -12,9 +13,9 @@ type PortfolioCategoryIndexPageProps = {
export default async function PortfolioCategoryIndexPage({
params,
}: PortfolioCategoryIndexPageProps) {
const { locale } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
await params;
const siteSettings = await getSiteSettings();
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
permanentRedirect(getLocalizedPath(localeKey, "/portfolio", siteSettings.defaultLocale));
}
app/[locale]/(site)/portfolio/page.tsx
+8 -9
View File
@@ -1,5 +1,5 @@
import type { Metadata } from "next";
import { getTranslations } from "next-intl/server";
import { getLocale, getTranslations } from "next-intl/server";
import { redirect } from "next/navigation";
import { Container } from "@/components/layout/container";
@@ -8,7 +8,7 @@ import { PortfolioCategoryFilter } from "@/components/site/portfolio-category-fi
import { PortfolioProjectGrid } from "@/components/site/portfolio-project-grid";
import { getSiteSettings } from "@/lib/app-config";
import { buildLocalizedMetadata } from "@/lib/metadata";
import { FALLBACK_LOCALE, getLocalizedPath, resolveLocale } from "@/lib/locale";
import { getLocalizedPath, resolveLocale } from "@/lib/locale";
import { getActivePortfolioCategories, getPublishedPortfolioProjects } from "@/lib/portfolio";
type PortfolioPageProps = {
@@ -23,8 +23,9 @@ type PortfolioPageProps = {
export const dynamic = "force-dynamic";
export async function generateMetadata({ params }: PortfolioPageProps): Promise<Metadata> {
const { locale } = await params;
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
await params;
const siteSettings = await getSiteSettings();
const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioPage" });
return await buildLocalizedMetadata({
@@ -43,11 +44,9 @@ export default async function PortfolioPage({
params,
searchParams,
]);
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const [t, siteSettings] = await Promise.all([
getTranslations({ locale: localeKey, namespace: "portfolioPage" }),
getSiteSettings(),
]);
const siteSettings = await getSiteSettings();
const localeKey = resolveLocale(await getLocale().catch(() => locale), siteSettings.defaultLocale);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioPage" });
const selectedCategory = resolvedSearchParams?.category ?? "";
if (selectedCategory) {