stack-site-builder 1.23.2 → 1.25.0

package/src/lib/locales.ts

@@ -14,3 +14,33 @@ export const allLocales = Object.keys(languages) as Lang[];
 /** The `[...lang]` param for a locale: `undefined` for the default, else the code. */
 export const langParam = (lang: Lang): string | undefined =>
   lang === defaultLang ? undefined : lang;
+
+/**
+ * Content-id helpers. Every collection is locale-partitioned by folder
+ * (`stacks/<code>/<slug>.mdx`), so an entry's id carries a `<code>/` prefix
+ * that listings filter on and slugs strip.
+ *
+ * Two details make the prefix worth deriving instead of hardcoding: Astro's
+ * glob loader runs every path segment through github-slugger, which
+ * LOWERCASES it, so a `zh-CN` folder yields the id `zh-cn/…`; and a locale
+ * code isn't necessarily two bare letters (`zh-CN`, `pt-BR`). Both are handled
+ * here once, so adding such a locale stays a site-config change.
+ */
+
+/** The `<locale>/` prefix an entry id carries for `lang`. */
+export const contentPrefix = (lang: Lang): string => `${lang.toLowerCase()}/`;
+
+/** Whether a content id belongs to `lang`. */
+export const inLocale = (id: string, lang: Lang): boolean => id.startsWith(contentPrefix(lang));
+
+const escapeRe = (s: string): string => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+// Longest code first, so `zh` can't shadow `zh-cn` on a site shipping both.
+const localePrefixRe = new RegExp(
+  `^(?:${allLocales
+    .map((l) => escapeRe(l.toLowerCase()))
+    .sort((a, b) => b.length - a.length)
+    .join('|')})/`,
+);
+
+/** An entry id with its `<locale>/` prefix removed — the basis of every slug. */
+export const stripLocale = (id: string): string => id.replace(localePrefixRe, '');

package/src/lib/pages.ts

@@ -1,18 +1,19 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
 import type { Lang } from '../i18n/ui';
+import { inLocale, stripLocale } from './locales';
 
 export type PageEntry = CollectionEntry<'pages'>;
 
 /** The url slug of a page, i.e. its id with the `<lang>/` prefix removed. */
 export function pageSlugOf(entry: PageEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /** Standalone pages for one locale, in `order` (then title) order. */
 export async function getPages(lang: Lang): Promise<PageEntry[]> {
   const all = await getCollection('pages');
   return all
-    .filter((e) => e.id.startsWith(`${lang}/`) && !e.data.draft)
+    .filter((e) => inLocale(e.id, lang) && !e.data.draft)
     .sort(
       (a, b) => a.data.order - b.data.order || a.data.title.localeCompare(b.data.title),
     );

package/src/lib/papers.ts

@@ -1,18 +1,19 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
 import type { Lang } from '../i18n/ui';
+import { inLocale, stripLocale } from './locales';
 
 export type PaperEntry = CollectionEntry<'papers'>;
 
 /** The url slug of a paper, i.e. its id with the `<lang>/` prefix removed. */
 export function paperSlugOf(entry: PaperEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /** Published papers for one locale — newest publication year first, then title. */
 export async function getPapers(lang: Lang): Promise<PaperEntry[]> {
   const all = await getCollection('papers');
   return all
-    .filter((e) => e.id.startsWith(`${lang}/`) && !e.data.draft)
+    .filter((e) => inLocale(e.id, lang) && !e.data.draft)
     .sort(
       (a, b) => (b.data.year ?? 0) - (a.data.year ?? 0) || a.data.title.localeCompare(b.data.title),
     );

package/src/lib/products.ts

@@ -1,5 +1,6 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
 import type { Lang } from '../i18n/ui';
+import { inLocale, stripLocale } from './locales';
 
 export type ProductEntry = CollectionEntry<'products'>;
 
@@ -7,14 +8,14 @@ export type ProductEntry = CollectionEntry<'products'>;
  *  nested (`flowstate-ai/privacy`), which the catch-all route renders at the
  *  matching subpath. */
 export function productSlugOf(entry: ProductEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /** Published product pages for one locale, in `order` (then title) order. */
 export async function getProducts(lang: Lang): Promise<ProductEntry[]> {
   const all = await getCollection('products');
   return all
-    .filter((e) => e.id.startsWith(`${lang}/`) && !e.data.draft)
+    .filter((e) => inLocale(e.id, lang) && !e.data.draft)
     .sort((a, b) => a.data.order - b.data.order || a.data.title.localeCompare(b.data.title));
 }
 

package/src/lib/slides.ts

@@ -1,5 +1,6 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
 import type { Lang } from '../i18n/ui';
+import { inLocale, stripLocale } from './locales';
 
 export type SlideDeck = CollectionEntry<'slides'>;
 
@@ -9,14 +10,14 @@ export type SlideDeck = CollectionEntry<'slides'>;
  * deck co-locates images) shares the same `<name>` slug as a flat `<name>.mdx`.
  */
 export function deckSlugOf(entry: SlideDeck): string {
-  return entry.id.replace(/^[a-z]{2}\//, '').replace(/\/index$/, '');
+  return stripLocale(entry.id).replace(/\/index$/, '');
 }
 
 /** Published slide decks for one locale, by `order` then title. */
 export async function getDecks(lang: Lang): Promise<SlideDeck[]> {
   const all = await getCollection('slides');
   return all
-    .filter((e) => e.id.startsWith(`${lang}/`) && !e.data.draft)
+    .filter((e) => inLocale(e.id, lang) && !e.data.draft)
     .sort(
       (a, b) =>
         (a.data.order ?? 999) - (b.data.order ?? 999) ||

package/src/lib/stacks.ts

@@ -1,12 +1,13 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
 import type { Lang } from '../i18n/ui';
 import { descendantIds } from '@aas-data/categories';
+import { inLocale, stripLocale } from './locales';
 
 export type StackEntry = CollectionEntry<'stacks'>;
 
 /** The url slug of an entry, i.e. its id with the `<lang>/` prefix removed. */
 export function slugOf(entry: StackEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /** A name → url-safe slug, e.g. "Roo Code" → "roo-code". */
@@ -43,7 +44,7 @@ export async function getStackAliases(lang: Lang): Promise<{ alias: string; targ
 /** All stack entries for one locale (entries live in `stacks/<lang>/*.mdx`). */
 export async function getStacks(lang: Lang): Promise<StackEntry[]> {
   const all = await getCollection('stacks');
-  return all.filter((e) => e.id.startsWith(`${lang}/`));
+  return all.filter((e) => inLocale(e.id, lang));
 }
 
 /** Unique, sorted list of tags used by entries in a locale. */

package/src/pages/[...lang]/[page].astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageDetail from '../../components/PageDetail.astro';
 import PrivateGate from '../../components/PrivateGate.astro';
 import { getPages, pageSlugOf } from '../../lib/pages';
 import { allLocales, langParam } from '../../lib/locales';
+import { siteName } from '../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -23,7 +23,7 @@ const priv = entry.data.private;
 ---
 
 <BaseLayout
-  title={`${entry.data.title} — ${site.name}`}
+  title={`${entry.data.title} — ${siteName(lang)}`}
   description={priv ? entry.data.teaser : entry.data.description}
   lang={lang}
   path={`${slug}/`}

package/src/pages/[...lang]/article/[...id].astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import ArticleDetail from '../../../components/ArticleDetail.astro';
 import PrivateGate from '../../../components/PrivateGate.astro';
 import { getArticles, articleSlugOf } from '../../../lib/articles';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -23,7 +23,7 @@ const priv = entry.data.private;
 ---
 
 <BaseLayout
-  title={`${entry.data.title} — ${site.name}`}
+  title={`${entry.data.title} — ${siteName(lang)}`}
   description={priv ? entry.data.teaser : entry.data.description}
   lang={lang}
   path={`article/${slug}/`}

package/src/pages/[...lang]/article/category/[id].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../../layouts/BaseLayout.astro';
 import BlogIndex from '../../../../components/BlogIndex.astro';
 import { articleTree } from '@aas-data/article-categories';
 import { allLocales, langParam } from '../../../../lib/locales';
+import { siteName } from '../../../../i18n/ui';
 
 export const getStaticPaths = (() => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -20,6 +20,6 @@ const { lang, id } = Astro.props as { lang: string; id: string };
 const node = articleTree.map.get(id)!;
 ---
 
-<BaseLayout title={`${node.label[lang]} — ${site.name}`} lang={lang} path={`article/category/${id}/`}>
+<BaseLayout title={`${node.label[lang]} — ${siteName(lang)}`} lang={lang} path={`article/category/${id}/`}>
   <BlogIndex lang={lang} categoryId={id} />
 </BaseLayout>

package/src/pages/[...lang]/article/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import BlogIndex from '../../../components/BlogIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('blog.title')} — ${site.name}`} lang={lang} path="article/">
+<BaseLayout title={`${t('blog.title')} — ${siteName(lang)}`} lang={lang} path="article/">
   <BlogIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/categories/[id].astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import CategoryIndex from '../../../components/CategoryIndex.astro';
 import { allCategoryIds, categoryMap } from '@aas-data/categories';
 import { getStacksByCategory } from '../../../lib/stacks';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -23,6 +23,6 @@ const { lang, id } = Astro.props;
 const node = categoryMap.get(id)!;
 ---
 
-<BaseLayout title={`${node.label[lang]} — ${site.name}`} lang={lang} path={`categories/${id}/`}>
+<BaseLayout title={`${node.label[lang]} — ${siteName(lang)}`} lang={lang} path={`categories/${id}/`}>
   <CategoryIndex lang={lang} id={id} />
 </BaseLayout>

package/src/pages/[...lang]/concept/[...id].astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import ConceptDetail from '../../../components/ConceptDetail.astro';
 import PrivateGate from '../../../components/PrivateGate.astro';
 import { getConcepts, conceptSlugOf } from '../../../lib/concepts';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -23,7 +23,7 @@ const priv = entry.data.private;
 ---
 
 <BaseLayout
-  title={`${entry.data.title} — ${site.name}`}
+  title={`${entry.data.title} — ${siteName(lang)}`}
   description={priv ? entry.data.teaser : entry.data.description}
   lang={lang}
   path={`concept/${slug}/`}

package/src/pages/[...lang]/concept/category/[id].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../../layouts/BaseLayout.astro';
 import ConceptIndex from '../../../../components/ConceptIndex.astro';
 import { conceptTree } from '@aas-data/concept-categories';
 import { allLocales, langParam } from '../../../../lib/locales';
+import { siteName } from '../../../../i18n/ui';
 
 export const getStaticPaths = (() => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -20,6 +20,6 @@ const { lang, id } = Astro.props as { lang: string; id: string };
 const node = conceptTree.map.get(id)!;
 ---
 
-<BaseLayout title={`${node.label[lang]} — ${site.name}`} lang={lang} path={`concept/category/${id}/`}>
+<BaseLayout title={`${node.label[lang]} — ${siteName(lang)}`} lang={lang} path={`concept/category/${id}/`}>
   <ConceptIndex lang={lang} categoryId={id} />
 </BaseLayout>

package/src/pages/[...lang]/concept/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import ConceptIndex from '../../../components/ConceptIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('concept.title')} — ${site.name}`} lang={lang} path="concept/">
+<BaseLayout title={`${t('concept.title')} — ${siteName(lang)}`} lang={lang} path="concept/">
   <ConceptIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/course/[...id].astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import CourseDetail from '../../../components/CourseDetail.astro';
 import PrivateGate from '../../../components/PrivateGate.astro';
 import { getCourses, courseSlugOf } from '../../../lib/courses';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -23,7 +23,7 @@ const priv = entry.data.private;
 ---
 
 <BaseLayout
-  title={`${entry.data.title} — ${site.name}`}
+  title={`${entry.data.title} — ${siteName(lang)}`}
   description={priv ? entry.data.teaser : entry.data.description}
   lang={lang}
   path={`course/${slug}/`}

package/src/pages/[...lang]/course/category/[id].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../../layouts/BaseLayout.astro';
 import CourseIndex from '../../../../components/CourseIndex.astro';
 import { courseTree } from '@aas-data/course-categories';
 import { allLocales, langParam } from '../../../../lib/locales';
+import { siteName } from '../../../../i18n/ui';
 
 export const getStaticPaths = (() => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -20,6 +20,6 @@ const { lang, id } = Astro.props as { lang: string; id: string };
 const node = courseTree.map.get(id)!;
 ---
 
-<BaseLayout title={`${node.label[lang]} — ${site.name}`} lang={lang} path={`course/category/${id}/`}>
+<BaseLayout title={`${node.label[lang]} — ${siteName(lang)}`} lang={lang} path={`course/category/${id}/`}>
   <CourseIndex lang={lang} categoryId={id} />
 </BaseLayout>

package/src/pages/[...lang]/course/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import CourseIndex from '../../../components/CourseIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('course.title')} — ${site.name}`} lang={lang} path="course/">
+<BaseLayout title={`${t('course.title')} — ${siteName(lang)}`} lang={lang} path="course/">
   <CourseIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/glossary.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import Glossary from '../../components/Glossary.astro';
-import { useTranslations } from '../../i18n/ui';
+import { useTranslations, siteName } from '../../i18n/ui';
 import { allLocales, langParam } from '../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('glossary.title')} — ${site.name}`} lang={lang} path="glossary/">
+<BaseLayout title={`${t('glossary.title')} — ${siteName(lang)}`} lang={lang} path="glossary/">
   <Glossary lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/index.astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import Home from '../../components/Home.astro';
 import CardsHome from '../../components/CardsHome.astro';
 import { homeTemplate } from '../../lib/home';
 import { allLocales, langParam } from '../../lib/locales';
+import { siteName } from '../../i18n/ui';
 
 export const getStaticPaths = (() =>
   allLocales.map((lang) => ({ params: { lang: langParam(lang) }, props: { lang } }))) satisfies GetStaticPaths;
@@ -13,6 +13,6 @@ export const getStaticPaths = (() =>
 const { lang } = Astro.props;
 ---
 
-<BaseLayout title={site.name} lang={lang} path="">
+<BaseLayout title={siteName(lang)} lang={lang} path="">
   {homeTemplate === 'cards' ? <CardsHome lang={lang} /> : <Home lang={lang} />}
 </BaseLayout>

package/src/pages/[...lang]/paper/[...id].astro

@@ -1,11 +1,11 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import PaperDetail from '../../../components/PaperDetail.astro';
 import PrivateGate from '../../../components/PrivateGate.astro';
 import { getPapers, paperSlugOf } from '../../../lib/papers';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -23,7 +23,7 @@ const priv = entry.data.private;
 ---
 
 <BaseLayout
-  title={`${entry.data.title} — ${site.name}`}
+  title={`${entry.data.title} — ${siteName(lang)}`}
   description={priv ? entry.data.teaser : entry.data.description}
   lang={lang}
   path={`paper/${slug}/`}

package/src/pages/[...lang]/paper/category/[id].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../../layouts/BaseLayout.astro';
 import PapersIndex from '../../../../components/PapersIndex.astro';
 import { paperTree } from '@aas-data/paper-categories';
 import { allLocales, langParam } from '../../../../lib/locales';
+import { siteName } from '../../../../i18n/ui';
 
 export const getStaticPaths = (() => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -20,6 +20,6 @@ const { lang, id } = Astro.props as { lang: string; id: string };
 const node = paperTree.map.get(id)!;
 ---
 
-<BaseLayout title={`${node.label[lang]} — ${site.name}`} lang={lang} path={`paper/category/${id}/`}>
+<BaseLayout title={`${node.label[lang]} — ${siteName(lang)}`} lang={lang} path={`paper/category/${id}/`}>
   <PapersIndex lang={lang} categoryId={id} />
 </BaseLayout>

package/src/pages/[...lang]/paper/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import PapersIndex from '../../../components/PapersIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('paper.title')} — ${site.name}`} lang={lang} path="paper/">
+<BaseLayout title={`${t('paper.title')} — ${siteName(lang)}`} lang={lang} path="paper/">
   <PapersIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/products/[...id].astro

@@ -1,5 +1,4 @@
 ---
-import { site } from '@aas-data/site';
 import { render } from 'astro:content';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
@@ -10,6 +9,7 @@ import MermaidLoader from '../../../components/MermaidLoader.astro';
 import { getProducts, productSlugOf } from '../../../lib/products';
 import { allLocales, langParam } from '../../../lib/locales';
 import { inlineMd } from '../../../lib/inline-md';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -32,7 +32,7 @@ const bodyHasMermaid = (entry.body ?? '').includes('```mermaid');
 ---
 
 <BaseLayout
-  title={`${entry.data.title} — ${site.name}`}
+  title={`${entry.data.title} — ${siteName(lang)}`}
   description={priv ? entry.data.teaser : (entry.data.description ?? entry.data.subtitle)}
   lang={lang}
   path={`products/${slug}/`}

package/src/pages/[...lang]/products/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import ProductsIndex from '../../../components/ProductsIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('products.title')} — ${site.name}`} lang={lang} path="products/">
+<BaseLayout title={`${t('products.title')} — ${siteName(lang)}`} lang={lang} path="products/">
   <ProductsIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/rss.xml.ts

@@ -1,10 +1,9 @@
 import rss from '@astrojs/rss';
 import type { APIContext, GetStaticPaths } from 'astro';
 import { getRelativeLocaleUrl } from 'astro:i18n';
-import { site } from '@aas-data/site';
 import { getArticles, articleSlugOf } from '../../lib/articles';
 import { allLocales, langParam } from '../../lib/locales';
-import { useTranslations } from '../../i18n/ui';
+import { useTranslations, siteName } from '../../i18n/ui';
 
 // Per-locale RSS feed of the articles collection: /rss.xml (default locale)
 // and /<code>/rss.xml. Injected with the `articles` section, so a site that
@@ -25,7 +24,7 @@ export async function GET(context: APIContext) {
   // mirroring the sitemap's private-page filter.
   const articles = (await getArticles(lang)).filter((a) => !a.data.private);
   return rss({
-    title: `${site.name} — ${t('blog.title')}`,
+    title: `${siteName(lang)} — ${t('blog.title')}`,
     description: t('blog.tagline'),
     site: context.site,
     customData: `<language>${lang}</language>`,

package/src/pages/[...lang]/sample/[folder].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import SamplePage from '../../../components/SamplePage.astro';
 import { listSampleFolders } from '../../../lib/project';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (() => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -20,6 +20,6 @@ export const getStaticPaths = (() => {
 const { lang, folder } = Astro.props;
 ---
 
-<BaseLayout title={`samples/${folder} — ${site.name}`} lang={lang} path={`sample/${folder}/`}>
+<BaseLayout title={`samples/${folder} — ${siteName(lang)}`} lang={lang} path={`sample/${folder}/`}>
   <SamplePage lang={lang} folder={folder} />
 </BaseLayout>

package/src/pages/[...lang]/sample/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import SampleIndex from '../../../components/SampleIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('sample.title')} — ${site.name}`} lang={lang} path="sample/">
+<BaseLayout title={`${t('sample.title')} — ${siteName(lang)}`} lang={lang} path="sample/">
   <SampleIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/slides/index.astro

@@ -1,9 +1,8 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import SlidesIndex from '../../../components/SlidesIndex.astro';
-import { useTranslations } from '../../../i18n/ui';
+import { useTranslations, siteName } from '../../../i18n/ui';
 import { allLocales, langParam } from '../../../lib/locales';
 
 export const getStaticPaths = (() =>
@@ -13,6 +12,6 @@ const { lang } = Astro.props;
 const t = useTranslations(lang);
 ---
 
-<BaseLayout title={`${t('slides.title')} — ${site.name}`} lang={lang} path="slides/">
+<BaseLayout title={`${t('slides.title')} — ${siteName(lang)}`} lang={lang} path="slides/">
   <SlidesIndex lang={lang} />
 </BaseLayout>

package/src/pages/[...lang]/stack/[...id].astro

@@ -1,5 +1,4 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import { getRelativeLocaleUrl } from 'astro:i18n';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
@@ -7,6 +6,7 @@ import StackDetail from '../../../components/StackDetail.astro';
 import PrivateGate from '../../../components/PrivateGate.astro';
 import { getStacks, getStackAliases, slugOf, type StackEntry } from '../../../lib/stacks';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -49,7 +49,7 @@ const priv = entry?.data.private ?? false;
     </html>
   ) : (
     <BaseLayout
-      title={`${entry!.data.name} — ${site.name}`}
+      title={`${entry!.data.name} — ${siteName(lang)}`}
       description={priv ? entry!.data.teaser : entry!.data.description}
       lang={lang}
       path={`stack/${slugOf(entry!)}/`}