@koehler8/cms 1.0.0-beta.33 → 1.0.0-beta.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koehler8/cms",
-  "version": "1.0.0-beta.33",
+  "version": "1.0.0-beta.34",
   "description": "Vertex CMS — lightweight, config-driven Vue 3 framework with theming, extensions, and SSG support",
   "license": "MIT",
   "type": "module",

package/src/components/Header.vue

@@ -130,14 +130,26 @@ const isHeaderCompact = ref(false);
 const currentLocale = ref('');
 const availableLocales = computed(() => siteLocales.map((code) => code.trim()).filter(Boolean));
 
-// The base locale is served at the unprefixed root path (`/`) — clicking
-// the dropdown item for it should NOT navigate to `/{baseLocale}` because
-// that URL doesn't pre-render and would 404. Build the link path
-// accordingly: base → `/`, others → `/{locale}`.
+// Switching language keeps the visitor on the SAME page rather than bouncing
+// them to the locale's home. Slugs are shared across locales, so take the
+// current path, strip any leading non-base locale segment, and re-prefix with
+// the target locale. The base locale is served unprefixed (`/path`); others at
+// `/{locale}/path`. (`/{baseLocale}/path` doesn't pre-render and would 404,
+// hence the base stays unprefixed.)
 const localeHref = (locale) => {
-  if (locale === siteBaseLocale) return '/';
+  const segments = (route.path || '/').split('/').filter(Boolean);
+  if (segments.length) {
+    const first = segments[0].toLowerCase();
+    if (first !== siteBaseLocale && availableLocales.value.includes(first)) {
+      segments.shift();
+    }
+  }
+  const rest = segments.join('/');
   const slash = injectedSiteData.value?.site?.trailingSlash === true ? '/' : '';
-  return `/${locale}${slash}`;
+  if (locale === siteBaseLocale) {
+    return rest ? `/${rest}${slash}` : '/';
+  }
+  return rest ? `/${locale}/${rest}${slash}` : `/${locale}${slash}`;
 };
 const localeLabels = {
   en: 'English',

package/src/composables/usePageMeta.js

@@ -231,6 +231,11 @@ export function usePageMeta({ siteData, currentPage, locale }) {
     }
 
     return {
+      // Reflect the page's locale on <html lang> during SSR/prerender so the
+      // on-disk HTML for /{locale}/... ships the right language (the router
+      // guard only sets this client-side, after hydration). Base-locale pages
+      // fall back to the configured base locale.
+      htmlAttrs: { lang: localeValue.value || configBaseLocale || 'en' },
       title: pageMetaTitle.value,
       meta,
       link,