stack-site-builder 1.23.2 → 1.24.0

package/CHANGELOG.md

@@ -11,6 +11,61 @@ content schema, while a consuming site supplies only content, taxonomy data and
 config. Sites track the theme with `pnpm up stack-site-builder`, so each release
 here is a plain version bump they pull in.
 
+## [1.24.0] - 2026-08-25
+
+Adding a locale was already meant to be site config only — the README said so —
+but four strings never got the memo, so a site shipping a language beyond the
+theme's en/ko had no way to translate its pricing chips, difficulty tooltips or
+license labels, and no way to give the site itself a per-language name. This
+release closes those, along with two hardcodings that assumed the default locale
+is `en` and that a locale code is two bare letters.
+
+### Added
+
+- **Sites supply the enum label tables** — `site.pricingLabels` (the `pricing`
+  frontmatter enum), `site.difficultyLabels` (course `level` 1–5) and
+  `site.licenseLabels` (descriptive licenses like `proprietary`) now feed
+  `pricingLabel()` / `difficultyLabel()` / `licenseLabel()` with the same
+  precedence `useTranslations` already used: the site's table for this locale,
+  the theme's, then both again for the default locale. Each is
+  `{ <code>: { <key>: <label> } }`, merged per key, so a site lists only what it
+  needs — and a site can retranslate a locale the theme ships, since the site's
+  entry wins. Previously these three read en/ko literals with no override point,
+  which left a third locale's chips and tooltips rendering in the default
+  locale's language with nothing a site could do about it.
+- **`site.name` can be per-locale** — either one string for every locale (as
+  before, unchanged) or a record like
+  `{ en: 'Advanced Algorithms', ko: '고급 알고리즘' }`, resolved through the new
+  `siteName(lang)` export and falling back to the default locale then any entry.
+  Every place the name appears — page titles, the header wordmark and its
+  aria-label, the RSS channel title, the catalog and cards homepages, the deck
+  view — now goes through it.
+
+### Fixed
+
+- **The language auto-detect redirect works on non-`en`-default sites** — the
+  root home gated its redirect script on `lang === 'en'` instead of
+  `lang === defaultLang`, so a site whose first locale is anything else (a
+  ko-default lecture site, say) shipped the script on no page at all and never
+  auto-detected. The redirect now lands on whichever locale's home is served
+  without a prefix.
+- **Locale codes that aren't two bare letters** — every collection derived its
+  slugs with a copy of `/^[a-z]{2}\//` and filtered its listings with
+  `id.startsWith(`${lang}/`)`, so a `zh-CN` or `pt-BR` locale produced slugs
+  with the locale still glued on and listings that matched nothing. Both now go
+  through `stripLocale()` / `inLocale()` in `lib/locales.ts`, built from the
+  site's own locale codes. The prefix is compared lowercased because Astro's
+  glob loader lowercases every path segment when it derives content ids, so the
+  content folder may be cased either way (`stacks/zh-CN/` or `stacks/zh-cn/`).
+
+### Changed
+
+- **The playground demos a fourth locale, `zh-CN`** — deliberately a code that
+  is neither two letters nor all-lowercase, with its own `pricingLabels`,
+  `difficultyLabels`, `licenseLabels`, a per-locale `site.name` and a partial
+  `site.ui` table, so the fallbacks and the slug derivation stay covered by the
+  build.
+
 ## [1.23.2] - 2026-08-06
 
 ### Fixed
@@ -465,6 +520,7 @@ catalog sites from a thin content-only repository.
 - **Standalone development setup** — a devcontainer and a minimal `playground/`
   consuming site for developing and previewing the theme on its own.
 
+[1.24.0]: https://github.com/CodeComposeStudio/stack-site-builder/compare/v1.23.2...v1.24.0
 [1.23.2]: https://github.com/CodeComposeStudio/stack-site-builder/compare/v1.23.1...v1.23.2
 [1.23.1]: https://github.com/CodeComposeStudio/stack-site-builder/compare/v1.23.0...v1.23.1
 [1.23.0]: https://github.com/CodeComposeStudio/stack-site-builder/compare/v1.22.0...v1.23.0

package/README.md

@@ -36,7 +36,7 @@ export const collections = defineAasCollections({ categoryMap });
 
 | Where | What |
 | --- | --- |
-| `src/data/site.ts` | Site identity: name, repo URL (`repoNav: false` hides the header's GitHub link), the `locales` it ships, optional `sections` toggles, browser icons (`icons: { favicon, appleTouch, manifest }`), the `home` template, per-locale UI string overrides |
+| `src/data/site.ts` | Site identity: name (one string, or per-locale), repo URL (`repoNav: false` hides the header's GitHub link), the `locales` it ships, optional `sections` toggles, browser icons (`icons: { favicon, appleTouch, manifest }`), the `home` template, per-locale UI string overrides and enum label tables (`pricingLabels`, `difficultyLabels`, `licenseLabels`) |
 | `src/data/categories.ts` | The tool-catalog category tree (validated against content) |
 | `src/data/concept-categories.ts` · `article-categories.ts` · `course-categories.ts` · `product-categories.ts` · `paper-categories.ts` (opt-in) | Taxonomies for concepts / articles / courses / products / papers |
 | `src/data/glossary.mjs` | `[[Term]]` wikilink targets — each entry links a term to a `stack` / `concept` / `article` / `course` / `paper` page, an external `href`, or is a definition-only term (`def`) |
@@ -63,6 +63,21 @@ locale from one source. To add a language (say Japanese):
    you omit falls back to the default locale. Add the `<code>` translations to
    your content (`src/content/<collection>/<code>/…`), glossary and category
    labels the same way you did for the built-in locales.
+4. Supply the enum labels the theme only ships in en/ko, under the same
+   per-locale shape: `site.pricingLabels` (the `pricing` frontmatter enum),
+   `site.difficultyLabels` (course `level` 1–5) and `site.licenseLabels`
+   (descriptive licenses like `proprietary`; real license names pass through).
+   Each is `{ <code>: { <key>: <label> } }`, merged per key over the theme's
+   table, so you list only what you need. A site can also retranslate a locale
+   the theme ships — the site's entry wins.
+5. If the site's own name differs per language, make `site.name` a per-locale
+   record — `name: { en: 'Advanced Algorithms', ko: '고급 알고리즘' }` — instead of
+   one string. A locale it omits falls back to the default locale.
+
+A locale code doesn't have to be two letters: `zh-CN` and `pt-BR` work, and the
+content folder may be cased either way (`stacks/zh-CN/` or `stacks/zh-cn/`) —
+Astro lowercases the path segment when it derives content ids, which the theme
+accounts for.
 
 No theme files change — adding a locale is entirely site config and content.
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stack-site-builder",
   "type": "module",
-  "version": "1.23.2",
+  "version": "1.24.0",
   "license": "MIT",
   "description": "The engine behind the awesome-*-stack catalog sites: an Astro theme with the catalog/concepts/articles/slides/samples routes, components, styles and markdown pipeline. Sites provide content, taxonomy data and config.",
   "repository": {

package/src/components/CardsHome.astro

@@ -6,7 +6,7 @@
 import { site } from '@aas-data/site';
 import { getRelativeLocaleUrl } from 'astro:i18n';
 import { home, loc, locList } from '../lib/home';
-import { useTranslations, type Lang } from '../i18n/ui';
+import { useTranslations, siteName, type Lang } from '../i18n/ui';
 
 interface Props {
   lang: Lang;
@@ -18,7 +18,7 @@ const h = home;
 const base = import.meta.env.BASE_URL.replace(/\/$/, '');
 const withBase = (p?: string) => (p && p.startsWith('/') ? base + p : p);
 
-const heroTitle = loc(h?.hero?.title, lang) ?? site.name;
+const heroTitle = loc(h?.hero?.title, lang) ?? siteName(lang);
 const heroSubtitle = loc(h?.hero?.subtitle, lang) ?? t('site.tagline');
 const extAttrs = (external?: boolean) =>
   external ? { target: '_blank', rel: 'noopener noreferrer' } : {};

package/src/components/DeckView.astro

@@ -1,11 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import '../styles/global.css';
 import { getRelativeLocaleUrl } from 'astro:i18n';
 import { render, type CollectionEntry } from 'astro:content';
 import MermaidLoader from './MermaidLoader.astro';
 import PrivateGate from './PrivateGate.astro';
-import { useTranslations, type Lang } from '../i18n/ui';
+import { useTranslations, siteName, type Lang } from '../i18n/ui';
 import { siteIcons } from '../lib/icons';
 
 // Renders a full-screen slide deck as a horizontal scroll-snap presentation.
@@ -31,7 +30,7 @@ const priv = entry.data.private;
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>{entry.data.title} — {site.name}</title>
+    <title>{entry.data.title} — {siteName(lang)}</title>
     <meta name="description" content={(priv ? entry.data.teaser : entry.data.description) ?? ''} />
     {priv && <meta name="robots" content="noindex" />}
     <link rel="icon" {...(siteIcons.faviconType ? { type: siteIcons.faviconType } : {})} href={`${base}${siteIcons.favicon}`} />

package/src/components/Home.astro

@@ -8,7 +8,7 @@ import { getStacks, slugOf } from '../lib/stacks';
 import { site } from '@aas-data/site';
 import { deriveFacets } from '../lib/facets';
 import { memberOnlyInIndex } from '../lib/listing';
-import { useTranslations, type Lang } from '../i18n/ui';
+import { useTranslations, siteName, type Lang } from '../i18n/ui';
 
 interface Props {
   lang: Lang;
@@ -33,7 +33,7 @@ const facets = deriveFacets(entries, lang);
 ---
 
 <section class="py-6">
-  <h1 class="text-4xl font-bold tracking-tight">{site.name}</h1>
+  <h1 class="text-4xl font-bold tracking-tight">{siteName(lang)}</h1>
   <p class="mt-3 max-w-2xl text-lg text-[var(--aas-muted)]">{t('site.tagline')}</p>
 </section>
 

package/src/i18n/ui.ts

@@ -25,9 +25,23 @@ const themeLocales: LocaleDef[] = [
   { code: 'en', label: 'English', dateLocale: 'en-US' },
   { code: 'ko', label: '한국어', dateLocale: 'ko-KR' },
 ];
-// Read defensively: a site that hasn't opted into custom locales simply has no
-// `locales` field, and should keep the theme's en/ko default (not a type error).
-const siteLocales = (site as { locales?: LocaleDef[] }).locales;
+/** A per-locale label table: `{ <locale>: { <key>: <label> } }`. Sites supply
+ *  these for locales the theme doesn't ship (see {@link pricingLabels}). */
+export type LabelTable = Record<string, Record<string, string>>;
+
+// Read defensively: every field below is optional, and a site that declares
+// none of them must not be a type error — the `@aas-data/site` alias points at
+// the site's own object, whose exact shape the theme can't know.
+const siteCfg = site as {
+  name?: string | Record<string, string>;
+  locales?: LocaleDef[];
+  pricingLabels?: LabelTable;
+  difficultyLabels?: LabelTable;
+  licenseLabels?: LabelTable;
+};
+// A site that hasn't opted into custom locales simply has no `locales` field,
+// and should keep the theme's en/ko default.
+const siteLocales = siteCfg.locales;
 const localeList: LocaleDef[] =
   Array.isArray(siteLocales) && siteLocales.length ? siteLocales : themeLocales;
 
@@ -51,6 +65,20 @@ export function dateLocaleOf(lang: Lang): string {
   );
 }
 
+/**
+ * The site's name in `lang`. `site.name` is either one string used for every
+ * locale (the common case) or a per-locale record — `{ ko: '고급 알고리즘', en:
+ * 'Advanced Algorithms' }` — which falls back to the default locale, then to
+ * any entry. Same rule as `loc()` in lib/home.ts, inlined here because that
+ * module imports this one.
+ */
+export function siteName(lang: Lang): string {
+  const n = siteCfg.name;
+  if (n == null) return '';
+  if (typeof n === 'string') return n;
+  return n[lang] ?? n[defaultLang] ?? Object.values(n)[0] ?? '';
+}
+
 /** UI chrome strings, keyed by a dotted id. */
 export const ui = {
   en: {
@@ -436,14 +464,35 @@ export function useTranslations(lang: Lang) {
   };
 }
 
+/**
+ * Look one label up with the same precedence `useTranslations` uses: the site's
+ * table for this locale, the theme's, then both again for the default locale.
+ * The site-first order lets a site retranslate a locale the theme ships; the
+ * default-locale fallback keeps a site-added locale from rendering a bare key.
+ */
+function lookupLabel(
+  siteTable: LabelTable | undefined,
+  themeTable: LabelTable,
+  lang: Lang,
+  key: string,
+): string | undefined {
+  return (
+    siteTable?.[lang]?.[key] ??
+    themeTable[lang]?.[key] ??
+    siteTable?.[defaultLang]?.[key] ??
+    themeTable[defaultLang]?.[key]
+  );
+}
+
 /** Localized label for a `pricing` enum value, falling back to the default
  *  locale then the raw value (so a site-added locale never crashes). */
 export function pricingLabel(lang: Lang, value: string): string {
-  return pricingLabels[lang]?.[value] ?? pricingLabels[defaultLang]?.[value] ?? value;
+  return lookupLabel(siteCfg.pricingLabels, pricingLabels, lang, value) ?? value;
 }
 
-/** Human labels for the `pricing` frontmatter enum, per locale. */
-export const pricingLabels: Record<string, Record<string, string>> = {
+/** Human labels for the `pricing` frontmatter enum, per locale. A site adds its
+ *  own locales via `site.pricingLabels` — same shape, merged per-key. */
+export const pricingLabels: LabelTable = {
   en: {
     'completely-free': 'Completely free',
     'open-source': 'Open source',
@@ -464,20 +513,22 @@ export const pricingLabels: Record<string, Record<string, string>> = {
  *  locale then the bare number (so a site-added locale never crashes). */
 export function difficultyLabel(lang: Lang, level: number): string {
   const key = String(level);
-  return difficultyLabels[lang]?.[key] ?? difficultyLabels[defaultLang]?.[key] ?? key;
+  return lookupLabel(siteCfg.difficultyLabels, difficultyLabels, lang, key) ?? key;
 }
 
-/** Human labels for the course `level` frontmatter (1–5), per locale. */
-export const difficultyLabels: Record<string, Record<string, string>> = {
+/** Human labels for the course `level` frontmatter (1–5), per locale. A site
+ *  adds its own locales via `site.difficultyLabels`. */
+export const difficultyLabels: LabelTable = {
   en: { '1': 'Beginner', '2': 'Elementary', '3': 'Intermediate', '4': 'Advanced', '5': 'Expert' },
   ko: { '1': '입문', '2': '초급', '3': '중급', '4': '고급', '5': '전문가' },
 };
 
-/** Descriptive (non-name) licenses get localized; real license names pass through. */
-const licenseLabels: Record<string, Record<string, string>> = {
+/** Descriptive (non-name) licenses get localized; real license names pass
+ *  through. A site adds its own locales via `site.licenseLabels`. */
+const licenseLabels: LabelTable = {
   en: { proprietary: 'Proprietary' },
   ko: { proprietary: '독점' },
 };
 export function licenseLabel(lang: Lang, value: string): string {
-  return licenseLabels[lang]?.[value] ?? licenseLabels[defaultLang]?.[value] ?? value;
+  return lookupLabel(siteCfg.licenseLabels, licenseLabels, lang, value) ?? value;
 }

package/src/layouts/BaseLayout.astro

@@ -2,7 +2,7 @@
 import '../styles/global.css';
 import { site } from '@aas-data/site';
 import { getRelativeLocaleUrl } from 'astro:i18n';
-import { useTranslations, languages, type Lang } from '../i18n/ui';
+import { useTranslations, languages, siteName, defaultLang, type Lang } from '../i18n/ui';
 import LanguageSwitcher from '../components/LanguageSwitcher.astro';
 import ThemeToggle from '../components/ThemeToggle.astro';
 import BackToTop from '../components/BackToTop.astro';
@@ -55,7 +55,7 @@ const baseNoSlash = base.replace(/\/$/, '');
 
 // Header brand: `site.header = { logo?: '/path.png', logoInvert?: bool,
 // name?: bool }`. A logo replaces the ⚡ bolt; `name: false` drops the
-// wordmark (logo-only brand — the link keeps site.name as its aria-label).
+// wordmark (logo-only brand — the link keeps siteName(lang) as its aria-label).
 const header = (site as { header?: { logo?: string; logoInvert?: boolean; name?: boolean } })
   .header;
 const brandLogo = header?.logo;
@@ -65,7 +65,11 @@ const brandName = header?.name !== false;
 const localeHomes = Object.fromEntries(
   (Object.keys(languages) as Lang[]).map((c) => [c, getRelativeLocaleUrl(c, '')]),
 );
-const isDefaultHome = path === '' && lang === 'en';
+// The auto-detect redirect belongs on the ROOT home — the one page served
+// without a locale prefix — which is the default locale's, whatever it is. This
+// read 'en' until 1.24.0, so a ko-default (or any non-en-default) site never
+// redirected at all.
+const isDefaultHome = path === '' && lang === defaultLang;
 
 // Standalone pages (the `pages` collection) that opt into a header-nav link,
 // e.g. an About/소개 page. Rendered as their own nav items alongside the
@@ -216,7 +220,7 @@ const navItems = allNavItems.filter((item) => !item.section || sectionEnabled(it
         <link
           rel="alternate"
           type="application/rss+xml"
-          title={`${site.name} — ${t('blog.title')}`}
+          title={`${siteName(lang)} — ${t('blog.title')}`}
           href={getRelativeLocaleUrl(lang, 'rss.xml')}
         />
       )
@@ -287,7 +291,7 @@ const navItems = allNavItems.filter((item) => !item.section || sectionEnabled(it
         <a
           href={home}
           data-keep-filters
-          aria-label={site.name}
+          aria-label={siteName(lang)}
           class="flex min-w-0 items-center gap-1.5 text-base font-bold tracking-tight whitespace-nowrap no-underline sm:text-lg"
         >
           {
@@ -302,7 +306,7 @@ const navItems = allNavItems.filter((item) => !item.section || sectionEnabled(it
             )
           }
           {/* Below 600px only the mark remains, so the narrow header never truncates the wordmark. */}
-          {brandName && <span class="hidden truncate min-[600px]:inline">{site.name}</span>}
+          {brandName && <span class="hidden truncate min-[600px]:inline">{siteName(lang)}</span>}
         </a>
         {/* Section links are icon-only (labels live in aria-label). On phones
             (<sm) they collapse into the labelled dropdown menu below, so the

package/src/lib/articles.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 ArticleEntry = CollectionEntry<'articles'>;
 
 /** The url slug of an article, i.e. its id with the `<lang>/` prefix removed. */
 export function articleSlugOf(entry: ArticleEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /** Published articles for one locale, newest first. */
 export async function getArticles(lang: Lang): Promise<ArticleEntry[]> {
   const all = await getCollection('articles');
   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.date.valueOf() - a.data.date.valueOf());
 }
 

package/src/lib/concepts.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 ConceptEntry = CollectionEntry<'concepts'>;
 
 /** The url slug of a concept, i.e. its id with the `<lang>/` prefix removed. */
 export function conceptSlugOf(entry: ConceptEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /** Published concepts for one locale, by `order` then title. */
 export async function getConcepts(lang: Lang): Promise<ConceptEntry[]> {
   const all = await getCollection('concepts');
   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/courses.ts

@@ -1,11 +1,12 @@
 import { getCollection, type CollectionEntry } from 'astro:content';
 import type { Lang } from '../i18n/ui';
+import { inLocale, stripLocale } from './locales';
 
 export type CourseEntry = CollectionEntry<'courses'>;
 
 /** The url slug of a course, i.e. its id with the `<lang>/` prefix removed. */
 export function courseSlugOf(entry: CourseEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
+  return stripLocale(entry.id);
 }
 
 /**
@@ -16,7 +17,7 @@ export function courseSlugOf(entry: CourseEntry): string {
 export async function getCourses(lang: Lang): Promise<CourseEntry[]> {
   const all = await getCollection('courses');
   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.order ?? '').localeCompare(a.data.order ?? '') ||

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!)}/`}

package/src/pages/[...lang]/tags/[tag].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import TagIndex from '../../../components/TagIndex.astro';
 import { getAllTags } from '../../../lib/stacks';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -19,6 +19,6 @@ export const getStaticPaths = (async () => {
 const { lang, tag } = Astro.props;
 ---
 
-<BaseLayout title={`#${tag} — ${site.name}`} lang={lang} path={`tags/${tag}/`}>
+<BaseLayout title={`#${tag} — ${siteName(lang)}`} lang={lang} path={`tags/${tag}/`}>
   <TagIndex lang={lang} tag={tag} />
 </BaseLayout>

package/src/pages/[...lang]/vendors/[vendor].astro

@@ -1,10 +1,10 @@
 ---
-import { site } from '@aas-data/site';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import VendorIndex from '../../../components/VendorIndex.astro';
 import { getAllVendors } from '../../../lib/stacks';
 import { allLocales, langParam } from '../../../lib/locales';
+import { siteName } from '../../../i18n/ui';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
@@ -19,6 +19,6 @@ export const getStaticPaths = (async () => {
 const { lang, vendor } = Astro.props;
 ---
 
-<BaseLayout title={`${vendor} — ${site.name}`} lang={lang} path={`vendors/${vendor}/`}>
+<BaseLayout title={`${vendor} — ${siteName(lang)}`} lang={lang} path={`vendors/${vendor}/`}>
   <VendorIndex lang={lang} vendor={vendor} />
 </BaseLayout>