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

Fix runtime default locale resolution
CI / quality (push) Waiting to run
Details

Browse Source
This commit is contained in:
MOH
2026-03-15 06:02:27 +01:00
parent 9b8409a7d3
commit c18128c965
29 changed files with 330 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/[locale]/(site)/portfolio/category/[slug]/page.tsx
+9 -5
View File
@@ -6,8 +6,9 @@ import { Container } from "@/components/layout/container";
import { PageHero } from "@/components/layout/page-hero";
import { PortfolioCategoryFilter } from "@/components/site/portfolio-category-filter";
import { PortfolioProjectGrid } from "@/components/site/portfolio-project-grid";
import { getSiteSettings } from "@/lib/app-config";
import { buildLocalizedMetadata } from "@/lib/metadata";
import { resolveLocale } from "@/lib/locale";
import { FALLBACK_LOCALE, resolveLocale } from "@/lib/locale";
import {
getActivePortfolioCategories,
getActivePortfolioCategoryBySlug,
@@ -26,7 +27,7 @@ export const dynamic = "force-dynamic";
export async function generateMetadata({ params }: PortfolioCategoryPageProps): Promise<Metadata> {
const { locale, slug } = await params;
const localeKey = resolveLocale(locale);
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioPage" });
const category = await getActivePortfolioCategoryBySlug(slug);
@@ -51,9 +52,10 @@ export default async function PortfolioCategoryPage({
params,
}: PortfolioCategoryPageProps) {
const { locale, slug } = await params;
const localeKey = resolveLocale(locale);
const t = await getTranslations({ locale: localeKey, namespace: "portfolioPage" });
const [categories, category, projects] = await Promise.all([
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const [t, siteSettings, categories, category, projects] = await Promise.all([
getTranslations({ locale: localeKey, namespace: "portfolioPage" }),
getSiteSettings(),
getActivePortfolioCategories(),
getActivePortfolioCategoryBySlug(slug),
getPublishedPortfolioProjects({ categorySlug: slug }),
@@ -75,12 +77,14 @@ export default async function PortfolioCategoryPage({
<Container className="flex flex-col gap-section pb-12 lg:pb-16">
<PortfolioCategoryFilter
locale={localeKey}
defaultLocale={siteSettings.defaultLocale}
categories={categories}
allLabel={t("all")}
activeCategorySlug={category.slug}
/>
<PortfolioProjectGrid
locale={localeKey}
defaultLocale={siteSettings.defaultLocale}
projects={projects}
emptyLabel={t("empty")}
openLabel={t("open")}
app/[locale]/(site)/portfolio/category/page.tsx
+5 -3
View File
@@ -1,6 +1,7 @@
import { permanentRedirect } from "next/navigation";
import { getLocalizedPath, resolveLocale } from "@/lib/locale";
import { getSiteSettings } from "@/lib/app-config";
import { FALLBACK_LOCALE, getLocalizedPath, resolveLocale } from "@/lib/locale";
type PortfolioCategoryIndexPageProps = {
params: Promise<{
@@ -12,7 +13,8 @@ export default async function PortfolioCategoryIndexPage({
params,
}: PortfolioCategoryIndexPageProps) {
const { locale } = await params;
const localeKey = resolveLocale(locale);
const localeKey = resolveLocale(locale, FALLBACK_LOCALE);
const siteSettings = await getSiteSettings();
permanentRedirect(getLocalizedPath(localeKey, "/portfolio"));
permanentRedirect(getLocalizedPath(localeKey, "/portfolio", siteSettings.defaultLocale));
}