fix: lang switch

lib/blog.ts

@@ -59,7 +59,8 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostD
   try {
     const payload = await getPayload({ config: configPromise });
 
-    const { docs } = await payload.find({
+    // First try: Find in the requested locale
+    let { docs } = await payload.find({
       collection: 'posts',
       where: {
         slug: { equals: slug },
@@ -70,6 +71,38 @@ export async function getPostBySlug(slug: string, locale: string): Promise<PostD
       limit: 1,
     });
 
+    // Fallback: If not found, try searching across all locales.
+    // This happens when a user uses the static language switcher
+    // e.g. switching from /en/blog/en-slug to /de/blog/en-slug.
+    if (!docs || docs.length === 0) {
+      const { docs: crossLocaleDocs } = await payload.find({
+        collection: 'posts',
+        where: {
+          slug: { equals: slug },
+          ...(!config.showDrafts ? { _status: { equals: 'published' } } : {}),
+        },
+        locale: 'all',
+        draft: config.showDrafts,
+        limit: 1,
+      });
+
+      if (crossLocaleDocs && crossLocaleDocs.length > 0) {
+        // Fetch the found document again, but strictly in the requested locale
+        // so we get the correctly translated fields (like the localized slug)
+        const { docs: correctLocaleDocs } = await payload.find({
+          collection: 'posts',
+          where: {
+            id: { equals: crossLocaleDocs[0].id },
+          },
+          locale: locale as any,
+          draft: config.showDrafts,
+          limit: 1,
+        });
+
+        docs = correctLocaleDocs;
+      }
+    }
+
     if (!docs || docs.length === 0) return null;
 
     const doc = docs[0];

lib/pages.ts

@@ -1,5 +1,7 @@
 import { getPayload } from 'payload';
 import configPromise from '@payload-config';
+import { mapSlugToFileSlug } from './slugs';
+import { config } from '@/lib/config';
 
 export interface PageFrontmatter {
   title: string;
@@ -44,19 +46,81 @@ function mapDoc(doc: any): PageData {
 export async function getPageBySlug(slug: string, locale: string): Promise<PageData | null> {
   try {
     const payload = await getPayload({ config: configPromise });
+    const fileSlug = await mapSlugToFileSlug(slug, locale);
 
-    const result = await payload.find({
-      collection: 'pages' as any,
+    // Try finding exact match first
+    let result = await payload.find({
+      collection: 'pages',
       where: {
-        slug: { equals: slug },
+        and: [
+          { slug: { equals: fileSlug } },
+          ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
+        ],
       },
       locale: locale as any,
+      depth: 1,
       limit: 1,
     });
 
-    const docs = result.docs as any[];
-    if (!docs || docs.length === 0) return null;
-    return mapDoc(docs[0]);
+    // Fallback: search ALL locales
+    if (result.docs.length === 0) {
+      const crossResult = await payload.find({
+        collection: 'pages',
+        where: {
+          and: [
+            { slug: { equals: fileSlug } },
+            ...(!config.showDrafts ? [{ _status: { equals: 'published' } }] : []),
+          ],
+        },
+        locale: 'all',
+        depth: 1,
+        limit: 1,
+      });
+
+      if (crossResult.docs.length > 0) {
+        // Fetch missing exact match by internal id
+        result = await payload.find({
+          collection: 'pages',
+          where: {
+            id: { equals: crossResult.docs[0].id },
+          },
+          locale: locale as any,
+          depth: 1,
+          limit: 1,
+        });
+      }
+    }
+
+    if (result.docs.length > 0) {
+      const doc = result.docs[0];
+
+      return {
+        slug: doc.slug,
+        frontmatter: {
+          title: doc.title,
+          excerpt: doc.excerpt || '',
+          featuredImage:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.sizes?.card?.url || doc.featuredImage.url
+              : null,
+          focalX:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.focalX
+              : 50,
+          focalY:
+            typeof doc.featuredImage === 'object' && doc.featuredImage !== null
+              ? doc.featuredImage.focalY
+              : 50,
+          layout:
+            doc.layout === 'fullBleed' || doc.layout === 'default'
+              ? doc.layout
+              : ('default' as const),
+        },
+        content: doc.content,
+      };
+    }
+
+    return null;
   } catch (error) {
     console.error(`[Payload] getPageBySlug failed for ${slug}:`, error);
     return null;