@acms-subir/core 0.3.61 → 0.3.63

package/src/lib/push/api.ts

@@ -136,7 +136,8 @@ export async function adminPushState(repo: ContentRepository, url: URL, locals?:
     calendarEnabled: CALENDAR.enabled,
     // "we're live" needs live video on (Integrations → Live video)
     liveMode: settings.live.mode,
-    calendars: calendars.filter((c) => c.visibility === 'public').map((c) => ({ id: c.id, slug: c.slug, name: c.name, color: c.color })),
+    // a rule can name an unlisted calendar too (a catch-all covers only public ones)
+    calendars: calendars.filter((c) => c.visibility !== 'private').map((c) => ({ id: c.id, slug: c.slug, name: c.name, color: c.color, visibility: c.visibility })),
     // suggestions for the event-change rule's "Only events tagged"
     tags: tags.map((t) => t.name),
     expo: { accessToken: Boolean(expo.accessToken), customEndpoint: expo.base !== EXPO_PUSH_BASE },
@@ -182,7 +183,8 @@ export async function adminPushAction(repo: ContentRepository, input: z.infer<ty
     }
     case 'saveAuto': {
       const collections = new Set(Object.keys(CONTENT.collections));
-      const calendars = new Set((CALENDAR.enabled ? await repo.listCalendars() : []).filter((c) => c.visibility === 'public').map((c) => c.id));
+      // private calendars never notify: a rule can't name one
+      const calendars = new Set((CALENDAR.enabled ? await repo.listCalendars() : []).filter((c) => c.visibility !== 'private').map((c) => c.id));
       const cals = (ids: string[]) => [...new Set(ids)].filter((id) => id === '*' || calendars.has(id));
       const known = await knownTopics(repo);
       const auto = {

package/src/lib/push/service.ts

@@ -5,7 +5,7 @@ import type { ContentRepository } from '../repo/types';
 import type { CalEvent, Calendar, Post, Settings } from '../schema';
 import { CONTENT, collectionUrl } from '../content';
 import { CALENDAR, eventUrl } from '../calendar/config';
-import { cutsAt, eventIsListed, eventTimeZone, expandEvents, findOccurrence, partOf, type Occurrence } from '../calendar/events';
+import { cutsAt, eventIsListed, eventIsPublic, eventTimeZone, expandEvents, findOccurrence, isGoogleBooking, partOf, type Occurrence } from '../calendar/events';
 import { describeRepeat } from '../calendar/rrule';
 import { tzParts } from '../calendar/ics';
 import { I18N, stripLocale } from '../i18n';
@@ -236,22 +236,32 @@ export async function sendNotification(repo: ContentRepository, input: SendInput
 
 // ---- automatic notices ---------------------------------------------------------
 
-const listedCalendars = (calendars: Calendar[]) => new Map(calendars.map((c) => [c.id, c]));
-const inRule = (rule: string[], e: CalEvent) => rule.includes('*') || e.calendarIds.some((id) => rule.includes(id));
-// a change rule: its calendars, and one of its tags when it lists some (any case)
-function inChangeRule(rule: ChangeRule, e: CalEvent) {
-  const tags = new Set(rule.tags.map((t) => t.toLowerCase()));
-  return inRule(rule.calendars, e) && (!tags.size || e.tags.some((t) => tags.has(t.toLowerCase())));
+const calendarMap = (calendars: Calendar[]) => new Map(calendars.map((c) => [c.id, c]));
+// Whether a rule (new event, starting soon, or a change rule) covers a
+// published event: one in its calendars ('*' = any) with, for a change rule
+// that lists tags, one of them (any case). A rule that names the event (one of
+// its calendars, or tags it has) covers it in any calendar that isn't private,
+// so a "Class" rule reaches classes in an unlisted rooms calendar; a catch-all
+// ('*' and no tags) stays with public calendars. Private calendars and Google
+// booking-page appointments never notify.
+function covers(rule: { calendars: string[]; tags?: string[] }, e: CalEvent, calendars: Map<string, Calendar>) {
+  const tags = new Set((rule.tags ?? []).map((t) => t.toLowerCase()));
+  const named = e.calendarIds.some((id) => rule.calendars.includes(id));
+  if (!named && !rule.calendars.includes('*')) return false;
+  if (tags.size && !e.tags.some((t) => tags.has(t.toLowerCase()))) return false;
+  if (isGoogleBooking(e)) return false;
+  return named || tags.size ? eventIsPublic(e, calendars) : eventIsListed(e, calendars);
 }
 // every rule that covers the event adds its topics, or the event's own when it
 // names none: in rule order, once each ([] = no rule covers it)
 function changeAudience(rules: ChangeRule[], e: CalEvent, calendars: Map<string, Calendar>) {
-  return [...new Set(rules.filter((r) => inChangeRule(r, e)).flatMap((r) => (r.topics.length ? r.topics : eventTopics(e, calendars))))];
+  return [...new Set(rules.filter((r) => covers(r, e, calendars)).flatMap((r) => (r.topics.length ? r.topics : eventTopics(e, calendars))))];
 }
 /**
  * The topics this event's change notices go to (Admin → Mobile app → When an
  * event changes), or [] while no rule covers it. Apps show it to promise
- * "we'll let you know if it changes" only when it's true.
+ * "we'll let you know if it changes" only when it's true. `calendars` holds
+ * every calendar (their visibility decides what notifies), not only public ones.
  */
 export function changeTopics(e: CalEvent, settings: Settings, calendars: Map<string, Calendar>): string[] {
   if (!PUSH.enabled || !CALENDAR.enabled) return [];
@@ -409,7 +419,8 @@ export async function queueEventChange(repo: ContentRepository, before: CalEvent
   const was = eventSnapshot(before);
   if (JSON.stringify(was) === JSON.stringify(eventSnapshot(after))) return false;
   const [settings, all] = await Promise.all([repo.getSettings(), repo.listCalendars()]);
-  if (!settings.push.auto.eventChanges.some((r) => inChangeRule(r, after)) || !eventIsListed(after, listedCalendars(all))) return false;
+  const calendars = calendarMap(all);
+  if (!settings.push.auto.eventChanges.some((r) => covers(r, after, calendars))) return false;
   const key = `change:${after.id}`;
   // a change to a date that starts soon waits only a minute (judged from what people last knew)
   const row = await repo.push.queuedChange(key);
@@ -506,7 +517,7 @@ export async function processPushQueue(repo: ContentRepository, opts: PushRunOpt
   if (!rows.length) return 0;
   const settings = await repo.getSettings();
   const auto = settings.push.auto;
-  const calendars = CALENDAR.enabled ? listedCalendars(await repo.listCalendars()) : new Map<string, Calendar>();
+  const calendars = CALENDAR.enabled ? calendarMap(await repo.listCalendars()) : new Map<string, Calendar>();
   const run = { ...opts, now, origin: opts.origin ?? siteOriginOf(settings, opts.fallbackOrigin) };
   let sent = 0;
   for (const row of rows) {
@@ -517,14 +528,14 @@ export async function processPushQueue(repo: ContentRepository, opts: PushRunOpt
         if (post && post.status === 'published' && CONTENT.collections[post.collection] && auto.newPost.collections.includes(post.collection)) notice = postNotice(post, settings);
       } else if (row.kind === 'event' && CALENDAR.enabled) {
         const e = await repo.getEvent(row.docId);
-        if (e && !e.cancelled && eventIsListed(e, calendars) && inRule(auto.newEvent.calendars, e)) notice = eventNotice(e, settings, calendars, now);
+        if (e && !e.cancelled && covers(auto.newEvent, e, calendars)) notice = eventNotice(e, settings, calendars, now);
       } else if (row.kind === 'change' && CALENDAR.enabled) {
         // compared at send time: edits that cancel out, or come too late, send nothing
         const e = await repo.getEvent(row.docId);
         const was = readSnapshot(row.payload);
         // one notice, to everyone the rules that cover it send to
         const topics = e ? changeAudience(auto.eventChanges, e, calendars) : [];
-        const change = e && was && topics.length && eventIsListed(e, calendars) ? eventChange(was, e, settings, now) : null;
+        const change = e && was && topics.length ? eventChange(was, e, settings, now) : null;
         if (e && change && !(await announcedLately(repo, e, run.origin, now))) notice = eventChangeNotice(e, change, settings, calendars, topics);
       }
       if (!notice) { await repo.push.markQueue(row.key, 'skipped', null, now); continue; }
@@ -547,8 +558,8 @@ export async function sendStartingSoon(repo: ContentRepository, opts: PushRunOpt
   const rule = settings.push.auto.startingSoon;
   if (!rule.calendars.length) return 0;
   const [all, events] = await Promise.all([repo.listCalendars(), repo.listPublishedEvents()]);
-  const calendars = listedCalendars(all);
-  const chosen = events.filter((e) => !e.cancelled && eventIsListed(e, calendars) && inRule(rule.calendars, e));
+  const calendars = calendarMap(all);
+  const chosen = events.filter((e) => !e.cancelled && covers(rule, e, calendars));
   if (!chosen.length) return 0;
   const lead = rule.minutes * MINUTE;
   const occurrences = expandEvents(chosen, settings, { displayTz: settings.timezone || 'UTC', now, windowStartMs: now, windowEndMs: now + lead + 1 })

package/src/lib/repo/migrations.ts

@@ -748,6 +748,13 @@ export const MIGRATIONS: Migration[] = [
     `DROP TRIGGER content_version_resources_update`,
     contentVersionTriggers('resources', [...CONTENT_VERSION_COLUMNS.resources, 'color', 'show_on_events', 'translations'])[2],
   ] },
+  // a booking link's name and description in other languages
+  // (BookingLink.translations): public, so a change refreshes cached pages and API answers
+  { version: 72, statements: [
+    `ALTER TABLE booking_links ADD COLUMN translations TEXT NOT NULL DEFAULT '{}'`,
+    `DROP TRIGGER content_version_booking_links_update`,
+    contentVersionTriggers('booking_links', [...CONTENT_VERSION_COLUMNS.booking_links, 'translations'])[2],
+  ] },
 ];
 
 // Current cache coverage; keep earlier migration inputs frozen for upgrade compatibility.
@@ -756,6 +763,7 @@ export const CURRENT_CONTENT_VERSION_COLUMNS = {
   settings: [...CONTENT_VERSION_COLUMNS.settings, 'links_verified', 'links_avatar_shape', 'links_avatar_fit', 'links_avatar_scale', 'legal'],
   events: [...CONTENT_VERSION_COLUMNS.events, 'cancelled_dates', 'moved_dates', 'segments'],
   resources: [...CONTENT_VERSION_COLUMNS.resources, 'color', 'show_on_events', 'translations'],
+  booking_links: [...CONTENT_VERSION_COLUMNS.booking_links, 'translations'],
   announcements: ANNOUNCEMENT_VISIBLE_COLUMNS,
 };
 

package/src/lib/repo/sql.ts

@@ -230,10 +230,15 @@ function rowToLink2(r: Row): BookingLink {
     hours: r.hours ? json(r.hours, null) : null, autoConfirm: Boolean(r.auto_confirm), visibility: r.visibility ?? 'public',
     approval: r.approval ?? 'default', approvalRules: json(r.approval_rules, {}),
     askPhone: Boolean(r.ask_phone), questions: json(r.questions, []), confirmMessage: r.confirm_message ?? '',
-    redirectUrl: r.redirect_url ?? '', active: Boolean(r.active), order: Number(r.ord ?? 0),
+    redirectUrl: r.redirect_url ?? '', active: Boolean(r.active), order: Number(r.ord ?? 0), translations: linkTranslations(r.translations),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
+// a booking link's words in other languages; a bad entry (or a broken column) reads as untranslated
+function linkTranslations(raw: unknown): BookingLink['translations'] {
+  const parsed = BookingLink.shape.translations.safeParse(json(raw, {}));
+  return parsed.success ? parsed.data : {};
+}
 function rowToBooking(r: Row): Booking {
   return Booking.parse({
     id: r.id, kind: r.kind ?? 'booking', resourceId: r.resource_id ?? '', linkId: r.link_id ?? '', eventId: r.event_id ?? '',
@@ -1175,11 +1180,11 @@ export class SqlRepository implements ContentRepository {
     return {
       sql: `INSERT INTO booking_links (id, resource_id, slug, name, description, mode, duration, lengths, min_days, max_days, step, buffer_before,
         buffer_after, min_notice, max_advance, per_day_cap, hours, auto_confirm, visibility, ask_phone, questions, confirm_message, redirect_url,
-        active, ord, created_at, updated_at, approval, approval_rules, change_cutoff) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        active, ord, created_at, updated_at, approval, approval_rules, change_cutoff, translations) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [l.id, l.resourceId, l.slug, l.name, l.description, l.mode, l.duration, JSON.stringify(l.lengths), l.minDays, l.maxDays, l.step,
         l.bufferBefore, l.bufferAfter, l.minNotice, l.maxAdvance, l.perDayCap, l.hours ? JSON.stringify(l.hours) : null, l.autoConfirm ? 1 : 0,
         l.visibility, l.askPhone ? 1 : 0, JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.createdAt, l.updatedAt,
-        l.approval, JSON.stringify(l.approvalRules), l.changeCutoff],
+        l.approval, JSON.stringify(l.approvalRules), l.changeCutoff, JSON.stringify(l.translations)],
     };
   }
   private bookingInsert(b: Booking): SqlStatement {
@@ -1271,10 +1276,10 @@ export class SqlRepository implements ContentRepository {
     await this.driver.run(
       `UPDATE booking_links SET slug = ?, name = ?, description = ?, mode = ?, duration = ?, lengths = ?, min_days = ?, max_days = ?, step = ?,
         buffer_before = ?, buffer_after = ?, min_notice = ?, max_advance = ?, per_day_cap = ?, hours = ?, auto_confirm = ?, visibility = ?,
-        ask_phone = ?, questions = ?, confirm_message = ?, redirect_url = ?, active = ?, ord = ?, updated_at = ?, approval = ?, approval_rules = ?, change_cutoff = ? WHERE id = ?`,
+        ask_phone = ?, questions = ?, confirm_message = ?, redirect_url = ?, active = ?, ord = ?, updated_at = ?, approval = ?, approval_rules = ?, change_cutoff = ?, translations = ? WHERE id = ?`,
       [l.slug, l.name, l.description, l.mode, l.duration, JSON.stringify(l.lengths), l.minDays, l.maxDays, l.step, l.bufferBefore, l.bufferAfter,
         l.minNotice, l.maxAdvance, l.perDayCap, l.hours ? JSON.stringify(l.hours) : null, l.autoConfirm ? 1 : 0, l.visibility, l.askPhone ? 1 : 0,
-        JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.updatedAt, l.approval, JSON.stringify(l.approvalRules), l.changeCutoff, id]
+        JSON.stringify(l.questions), l.confirmMessage, l.redirectUrl, l.active ? 1 : 0, l.order, l.updatedAt, l.approval, JSON.stringify(l.approvalRules), l.changeCutoff, JSON.stringify(l.translations), id]
     );
   }
   async deleteBookingLink(id: string) {

package/src/lib/schema.ts

@@ -288,7 +288,8 @@ export type Redirect = z.infer<typeof Redirect>;
 // admin; `feed` calendars mirror an external ICS feed (Google, Apple,
 // Outlook, any .ics) live, read-only. Visibility decides where a calendar's
 // events surface: `public` = listed on the calendar page + the all-calendars
-// feed; `unlisted` = event pages and its own feed work, but it's not listed;
+// feed; `unlisted` = event pages, its own feed and search work, but it's not
+// listed (push rules cover its events only when they name them);
 // `private` = admin-only, plus a secret-token feed for staff subscriptions.
 export const CalendarKind = z.enum(['native', 'feed']);
 export type CalendarKind = z.infer<typeof CalendarKind>;
@@ -583,6 +584,15 @@ export const DateOverride = z.object({
 });
 export type DateOverride = z.infer<typeof DateOverride>;
 
+// a language a room or booking link has its own words in ('es', 'es-MX')
+const LocaleKey = z.string().regex(/^[a-z]{2,3}(-[a-z0-9]{2,8})?$/);
+// an entry for `locale` ('es-MX' → 'es' when it has no entry of its own)
+const forLocale = <T>(all: Record<string, T> | undefined, locale?: string | null): T | undefined => {
+  if (!locale || !all) return undefined;
+  const want = locale.toLowerCase();
+  return all[want] ?? all[want.split('-')[0]];
+};
+
 export const Resource = z.object({
   id: z.string(),
   slug: z.string(),
@@ -613,7 +623,7 @@ export const Resource = z.object({
   requestable: z.boolean().default(false),
   // its name in the site's other languages ({ es: { name: 'Salón de jóvenes' } });
   // roomName() picks one, else `name`. The slug stays the same in every language.
-  translations: z.record(z.string().regex(/^[a-z]{2,3}(-[a-z0-9]{2,8})?$/), z.object({ name: z.string().max(120).default('') })).default({}),
+  translations: z.record(LocaleKey, z.object({ name: z.string().max(120).default('') })).default({}),
   // secret for the staff feed /book/<slug>.ics?t=… (bookings with names)
   feedToken: z.string().default(''),
   // the saved place this room is in ('' = none)
@@ -627,10 +637,7 @@ export type Resource = z.infer<typeof Resource>;
 export const roomColor = (r: Pick<Resource, 'color'>) => (/^#[0-9a-f]{6}$/i.test(r.color) ? r.color.toLowerCase() : '');
 /** A room's name in `locale` ('es', 'es-MX' → its 'es' name), else its main name. */
 export function roomName(r: Pick<Resource, 'name'> & { translations?: Resource['translations'] }, locale?: string | null): string {
-  if (!locale || !r.translations) return r.name;
-  const want = locale.toLowerCase();
-  const t = r.translations[want] ?? r.translations[want.split('-')[0]];
-  return t?.name.trim() || r.name;
+  return forLocale(r.translations, locale)?.name.trim() || r.name;
 }
 
 // A saved place (HQ, the park pavilion…): picked in an event's Where field,
@@ -803,11 +810,19 @@ export const BookingLink = z.object({
   confirmMessage: z.string().default(''),
   redirectUrl: z.string().default(''),
   active: z.boolean().default(true),
+  // its name and description in the site's other languages ({ es: { name: 'Ensayo' } });
+  // linkWords() picks them, each falling back to the main one. The slug stays the same.
+  translations: z.record(LocaleKey, z.object({ name: z.string().max(120).default(''), description: z.string().max(2000).default('') })).default({}),
   order: z.number().default(0),
   createdAt: z.number(),
   updatedAt: z.number(),
 });
 export type BookingLink = z.infer<typeof BookingLink>;
+/** A booking link's name and description in `locale` ('es-MX' → its 'es' words), each falling back to the main one. */
+export function linkWords(l: Pick<BookingLink, 'name' | 'description'> & { translations?: BookingLink['translations'] }, locale?: string | null): { name: string; description: string } {
+  const t = forLocale(l.translations, locale);
+  return { name: t?.name.trim() || l.name, description: t?.description.trim() || l.description };
+}
 
 // RSVPs only: waitlisted = in line for a full date (takes no seats); offered =
 // a freed spot held for them until holdUntil (takes its seats); expired = they

package/src/lib/sections.ts

@@ -1,7 +1,7 @@
 import sanitizeHtml from 'sanitize-html';
 import type { z } from 'zod';
 import type { ContentRepository } from './repo/types';
-import { authorSlug, tagFilter, type Settings, type User } from './schema';
+import { authorSlug, linkWords, roomName, tagFilter, type Settings, type User } from './schema';
 import { htmlToPlaintext } from './plaintext';
 import type { SectionInstance as SectionInstanceSchema, SectionDefinition } from '../theme-sdk/contract.mjs';
 import { normalizeData, safeUrl, SOURCE_LIMIT_MAX, isEmptyValue, safeFocus, focusKey } from '../theme-sdk/fields.mjs';
@@ -165,7 +165,9 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
   const links = (await repo.listBookingLinks()).filter((l) => l.active && l.visibility === 'public' && byId.has(l.resourceId));
   return links.slice(0, limit).map((l): BookingItem => {
     const r = byId.get(l.resourceId)!;
-    return { title: l.name, url: bookingLinkUrl(r.slug, l.slug), description: l.description, resource: r.name, minutes: l.duration };
+    // the link and room in the page's language (their main words without one)
+    const words = linkWords(l, lang);
+    return { title: words.name, url: lp(bookingLinkUrl(r.slug, l.slug)), description: words.description, resource: roomName(r, lang), minutes: l.duration };
   });
 }
 

package/src/pages/admin/calendar/resources/link.astro

@@ -11,6 +11,7 @@ import { siteOrigin } from '../../../../lib/seo';
 import { APPROVAL_LABEL, linkApproval, siteApproval } from '../../../../lib/booking/approval';
 import { ApprovalRules } from '../../../../lib/schema';
 import { forbiddenUnless } from '../../../../lib/permissions/access';
+import { extraLocales, localeName } from '../../../../lib/i18n';
 
 // One booking link: how people book, how bookings get approved (follow the
 // site setting, or its own mode + rules), when it's open (within the room or
@@ -69,8 +70,14 @@ if (Astro.request.method === 'POST') {
     deadlineHours: form.has('deadline') ? int(form.get('deadlineHours'), 1, 24 * 60, 48) : 0,
     deadlineAction: form.get('deadlineAction') === 'decline' ? 'decline' : 'approve',
   });
+  // its name and description in each of the site's other languages ('' = the main one); languages no longer configured keep theirs
+  const translations = { ...link.translations };
+  for (const l of extraLocales()) {
+    const words = { name: String(form.get('name_' + l) || '').trim().slice(0, 120), description: String(form.get('description_' + l) || '').trim().slice(0, 1000) };
+    if (words.name || words.description) translations[l] = words; else delete translations[l];
+  }
   const patch: Partial<BookingLink> = {
-    name, slug, mode: mode as BookingMode,
+    name, slug, mode: mode as BookingMode, translations,
     description: String(form.get('description') || '').slice(0, 1000),
     duration,
     lengths,
@@ -221,8 +228,14 @@ const effective = linkApproval(view, settings).mode;
       <section class="card card-pad">
         <div class="card-head"><b>Link</b></div>
         <label class="field"><span>Name</span><input type="text" name="name" value={view.name} required /></label>
+        {extraLocales().map((l) => (
+          <label class="field"><span>Name in {localeName(l)} <em class="hint">optional; shown on {localeName(l)} pages, in the app and in emails</em></span><input type="text" name={'name_' + l} lang={l} maxlength="120" value={view.translations[l]?.name ?? ''} placeholder={view.name} /></label>
+        ))}
         <label class="field"><span>URL name</span><input type="text" class="mono" name="slug" value={view.slug} /></label>
         <label class="field"><span>Description</span><textarea name="description" rows="3" placeholder="What this booking is for">{view.description}</textarea></label>
+        {extraLocales().map((l) => (
+          <label class="field"><span>Description in {localeName(l)} <em class="hint">optional</em></span><textarea name={'description_' + l} lang={l} rows="3" maxlength="1000" placeholder={view.description}>{view.translations[l]?.description ?? ''}</textarea></label>
+        ))}
         <label class="field">
           <span>Who can find it</span>
           <select name="visibility">

package/src/pages/api/search.ts

@@ -6,7 +6,7 @@ import { collectionUrl, tagUrl } from '../../lib/content';
 import { localeHomeUrl, normalizePageLocale } from '../../lib/i18n';
 import { formatDate, siteLocale } from '../../lib/dates';
 import { CALENDAR, eventUrl } from '../../lib/calendar/config';
-import { eventIsPublic, featuredOccurrence, formatOccurrence } from '../../lib/calendar/events';
+import { eventIsSearchable, featuredOccurrence, formatOccurrence } from '../../lib/calendar/events';
 
 // Public search API behind the site's search modal. Published-only by
 // construction — the same contract as rss/sitemap — so it needs no auth and
@@ -42,8 +42,8 @@ export const GET: APIRoute = async ({ locals, url }) => {
       snippet,
       locale: p.locale,
     })),
-    // private-calendar events never surface publicly
-    events: (CALENDAR.enabled ? results.events.filter(({ doc }) => eventIsPublic(doc, calMap)) : []).slice(0, LIMITS.events).map(({ doc: e, snippet }) => {
+    // the app's rule too: never private calendars or booking-page appointments
+    events: (CALENDAR.enabled ? results.events.filter(({ doc }) => eventIsSearchable(doc, calMap)) : []).slice(0, LIMITS.events).map(({ doc: e, snippet }) => {
       const o = featuredOccurrence(e, settings, now);
       return {
         title: e.title,

package/src/pages/book/[resource]/[link].astro

@@ -7,11 +7,13 @@ import { availabilityContext, createResourceBooking, guestMoveLink, guestResched
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
 import { localePath, requestLocale } from '../../../lib/i18n';
+import { linkWords, roomName } from '../../../lib/schema';
 
 // One booking link: pick → answer → done. POSTs create the booking (or move
 // one when ?reschedule=<token>) and land on the manage page. These pages are
-// in English, but a booking made from /es/… keeps the visitor's language for
-// its emails and its own page.
+// in English, but the link and room are named in the page's language (their
+// translations), every step stays under /es/…, and a booking made there keeps
+// the visitor's language for its emails and its own page.
 if (!bookingsEnabled()) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const resource = await repo.getResourceBySlug(Astro.params.resource ?? '');
@@ -64,11 +66,14 @@ if (Astro.request.method === 'POST') {
   }
 }
 const ctx = await availabilityContext(repo, resource, reschedule ? guestMoveLink(link) : link, settings, Date.now(), reschedule?.id);
+// the link and room named in the page's language
+const words = linkWords(link, locale);
+const room = roomName(resource, locale);
 ---
 
-<Site title={`${link.name} · ${resource.name}`} description={link.description || `Book ${resource.name}.`} noindex={link.visibility === 'unlisted' || resource.visibility === 'unlisted'}>
+<Site title={`${words.name} · ${room}`} description={words.description || `Book ${room}.`} noindex={link.visibility === 'unlisted' || resource.visibility === 'unlisted'}>
   <div class="pc-bkpage">
-    <BookingFlow resource={resource} link={link} ctx={ctx} settings={settings} url={flowUrl} error={error} values={values} reschedule={reschedule} />
-    <p class="pc-bk-foot"><a href={resourceUrl(resource.slug)}>Other ways to book {resource.name}</a></p>
+    <BookingFlow resource={resource} link={link} ctx={ctx} settings={settings} url={flowUrl} error={error} values={values} reschedule={reschedule} locale={locale} />
+    <p class="pc-bk-foot"><a href={localePath(resourceUrl(resource.slug), locale)}>Other ways to book {room}</a></p>
   </div>
 </Site>

package/src/pages/book/[resource]/index.astro

@@ -5,6 +5,8 @@ import { bookingLinkUrl, bookingsEnabled, CALENDAR } from '../../../lib/calendar
 import { availabilityContext } from '../../../lib/booking/service';
 import { describeLink, nextOpenings } from '../../../lib/booking/availability';
 import { fmt } from '../../../lib/booking/view';
+import { linkWords, roomName } from '../../../lib/schema';
+import { localePath, requestLocale } from '../../../lib/i18n';
 
 // A room (or person, or van) and its booking links (mockup C): each link is a
 // card with its rules, an Instant / Approval badge, and its next openings —
@@ -30,34 +32,38 @@ const chip = (start: number, link: (typeof links)[number]) => {
   return link.mode === 'slots' ? `${day} ${f.time.format(start)}` : day;
 };
 const facts = [resource.capacity ? `Up to ${resource.capacity}` : '', ...resource.amenities].filter(Boolean);
+// the room and its links named in the page's language, and links that stay in it
+const locale = requestLocale(Astro.url, Astro.locals);
+const room = roomName(resource, locale);
+const here = (path: string) => localePath(path, locale);
 ---
 
-<Site title={resource.name} description={resource.description || `Book ${resource.name}.`} image={resource.photo || undefined} noindex={resource.visibility === 'unlisted'}>
+<Site title={room} description={resource.description || `Book ${room}.`} image={resource.photo || undefined} noindex={resource.visibility === 'unlisted'}>
   <div class="pc-res">
     <div class="pc-res-about">
       {resource.photo ? <img class="pc-res-photo" src={resource.photo} alt="" /> : null}
       <span class="pc-res-kind">{resource.kind}</span>
-      <h1 class="pc-res-title">{resource.name}</h1>
+      <h1 class="pc-res-title">{room}</h1>
       {facts.length > 0 && <ul class="pc-res-facts">{facts.map((x) => <li>{x}</li>)}</ul>}
       {resource.description && <p class="pc-res-desc">{resource.description}</p>}
     </div>
     <div class="pc-res-links">
-      {cards.length === 0 && <p class="pc-bk-empty">Online booking isn’t open for {resource.name} right now.</p>}
+      {cards.length === 0 && <p class="pc-bk-empty">Online booking isn’t open for {room} right now.</p>}
       {cards.map(({ link, next }) => (
         <article class="pc-res-link">
           <div class="pc-res-linkhead">
-            <h2><a href={bookingLinkUrl(resource.slug, link.slug)}>{link.name}</a></h2>
+            <h2><a href={here(bookingLinkUrl(resource.slug, link.slug))}>{linkWords(link, locale).name}</a></h2>
             <span class={`pc-res-badge${link.autoConfirm ? ' is-instant' : ''}`}>{link.autoConfirm ? 'Instant' : 'Approval'}</span>
           </div>
-          <p>{[describeLink(link), link.description].filter(Boolean).join(' · ')}</p>
+          <p>{[describeLink(link), linkWords(link, locale).description].filter(Boolean).join(' · ')}</p>
           <div class="pc-res-next">
-            {next.map((s) => <a href={`${bookingLinkUrl(resource.slug, link.slug)}?date=${new Intl.DateTimeFormat('en-CA', { timeZone: tz, year: 'numeric', month: '2-digit', day: '2-digit' }).format(s.start)}&start=${s.start}&len=${s.minutes}`}>{chip(s.start, link)}</a>)}
+            {next.map((s) => <a href={`${here(bookingLinkUrl(resource.slug, link.slug))}?date=${new Intl.DateTimeFormat('en-CA', { timeZone: tz, year: 'numeric', month: '2-digit', day: '2-digit' }).format(s.start)}&start=${s.start}&len=${s.minutes}`}>{chip(s.start, link)}</a>)}
             {next.length === 0 && <span class="pc-res-none">No openings soon</span>}
-            <a class="pc-res-more" href={bookingLinkUrl(resource.slug, link.slug)}>{next.length ? 'More times ›' : 'See calendar ›'}</a>
+            <a class="pc-res-more" href={here(bookingLinkUrl(resource.slug, link.slug))}>{next.length ? 'More times ›' : 'See calendar ›'}</a>
           </div>
         </article>
       ))}
-      <p class="pc-bk-foot"><a href={CALENDAR.bookBase}>All rooms and people</a></p>
+      <p class="pc-bk-foot"><a href={here(CALENDAR.bookBase)}>All rooms and people</a></p>
     </div>
   </div>
 </Site>

package/src/pages/book/index.astro

@@ -2,6 +2,8 @@
 import Site from '../../layouts/Site.astro';
 import { getRepo } from '../../lib/repo';
 import { CALENDAR, bookingsEnabled, resourceUrl, bookingLinkUrl } from '../../lib/calendar/config';
+import { linkWords, roomName } from '../../lib/schema';
+import { localePath, requestLocale } from '../../lib/i18n';
 
 // Directory of everything bookable: public resources grouped by kind, each
 // with its public booking links.
@@ -13,6 +15,9 @@ const byKind = new Map<string, typeof listed>();
 for (const r of listed) byKind.set(r.kind, [...(byKind.get(r.kind) ?? []), r]);
 const linksOf = (id: string) => links.filter((l) => l.resourceId === id && l.active && l.visibility === 'public');
 const plural = (k: string) => (k.endsWith('s') ? k : k.endsWith('y') ? `${k.slice(0, -1)}ies` : `${k}s`);
+// rooms and links named in the page's language, and links that stay in it
+const locale = requestLocale(Astro.url, Astro.locals);
+const here = (path: string) => localePath(path, locale);
 ---
 
 <Site title="Book" description={`Book rooms and time at ${settings.siteTitle}.`}>
@@ -32,11 +37,11 @@ const plural = (k: string) => (k.endsWith('s') ? k : k.endsWith('y') ? `${k.slic
         <div class="pc-dir-grid">
           {list.map((r) => (
             <article class="pc-dir-card">
-              <a class="pc-dir-media" href={resourceUrl(r.slug)} tabindex="-1" aria-hidden="true">{r.photo ? <img src={r.photo} alt="" loading="lazy" /> : <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21V9l9-5 9 5v12M9 21v-6h6v6" /></svg>}</a>
+              <a class="pc-dir-media" href={here(resourceUrl(r.slug))} tabindex="-1" aria-hidden="true">{r.photo ? <img src={r.photo} alt="" loading="lazy" /> : <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21V9l9-5 9 5v12M9 21v-6h6v6" /></svg>}</a>
               <div class="pc-dir-body">
-                <h3><a href={resourceUrl(r.slug)}>{r.name}</a></h3>
+                <h3><a href={here(resourceUrl(r.slug))}>{roomName(r, locale)}</a></h3>
                 <p>{[r.capacity ? `Up to ${r.capacity}` : '', ...r.amenities.slice(0, 3)].filter(Boolean).join(' · ')}</p>
-                <div class="pc-dir-links">{linksOf(r.id).map((l) => <a href={bookingLinkUrl(r.slug, l.slug)}>{l.name}</a>)}</div>
+                <div class="pc-dir-links">{linksOf(r.id).map((l) => <a href={here(bookingLinkUrl(r.slug, l.slug))}>{linkWords(l, locale).name}</a>)}</div>
               </div>
             </article>
           ))}

package/src/pages/book/manage/[token].astro

@@ -5,6 +5,8 @@ import { CALENDAR, bookingLinkUrl, bookingsEnabled, eventUrl, resourceUrl } from
 import { confirmOffer, guestCancel, guestChanges, waitlistPosition, BookingError, WAITLIST_HOLD } from '../../../lib/booking/service';
 import { bookingIcs, whenText } from '../../../lib/booking/emails';
 import { resourceZone } from '../../../lib/booking/availability';
+import { bookingTitle } from '../../../lib/booking/view';
+import { roomName } from '../../../lib/schema';
 import { eventTimeZone, locationLine } from '../../../lib/calendar/events';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
@@ -43,8 +45,8 @@ const lang = locale || siteLang(settings);
 const bw = bookingStrings(lang).page;
 const w = isRsvp ? rsvpStrings(lang) : { ...rsvpStrings(lang), ...bw };
 const event = rawEvent && localizeDoc(rawEvent, locale || undefined);
-const title = event ? event.title : [resource?.name, link?.name].filter(Boolean).join(' · ') || bw.untitled;
-const location = event ? locationLine(event.location) : resource?.name ?? '';
+const title = event ? event.title : bookingTitle(resource, link, locale) || bw.untitled;
+const location = event ? locationLine(event.location) : resource ? roomName(resource, locale) : '';
 // the address the visitor sees (/es/… is rewritten to this route)
 const url = origin + localePath(Astro.url.pathname, locale);
 
@@ -166,7 +168,7 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
     )}
     {can.closed && <p class="pc-manage-note">{cutoff}</p>}
     <p class="pc-bk-foot">
-      {event ? <a href={localePath(eventUrl(event.slug), locale)}>{fill(w.backTo, { title: event.title })}</a> : resource ? <a href={resourceUrl(resource.slug)}>{fill(w.backTo, { title: resource.name })}</a> : null}
+      {event ? <a href={localePath(eventUrl(event.slug), locale)}>{fill(w.backTo, { title: event.title })}</a> : resource ? <a href={resourceUrl(resource.slug)}>{fill(w.backTo, { title: roomName(resource, locale) })}</a> : null}
     </p>
     <p class="pc-manage-note">{w.keepLink}</p>
   </div>

package/src/pages/embed/book/[resource]/[link].astro

@@ -4,25 +4,33 @@ import BookingFlow from '../../../../components/booking/BookingFlow.astro';
 import { getRepo } from '../../../../lib/repo';
 import { bookingLinkUrl, bookingsEnabled } from '../../../../lib/calendar/config';
 import { availabilityContext } from '../../../../lib/booking/service';
+import { I18N, localePath } from '../../../../lib/i18n';
+import { linkWords } from '../../../../lib/schema';
 
 // Embeddable picker for other sites: day + time selection happens inside the
 // iframe; choosing a time opens the full booking page (top window) to finish.
+// ?lang=es (one of the site's languages; embeds are never under /es) names the
+// link and room in it and hands off to that language's page.
 if (!bookingsEnabled()) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const resource = await repo.getResourceBySlug(Astro.params.resource ?? '');
 const link = resource ? await repo.getBookingLinkBySlug(resource.id, Astro.params.link ?? '') : null;
 if (!resource || !link || !link.active) return new Response(null, { status: 404 });
 const settings = await repo.getSettings();
+const langParam = Astro.url.searchParams.get('lang') ?? '';
+const locale = I18N.enabled && I18N.locales.includes(langParam) ? langParam : '';
 // a chosen time hands off to the real page, where the form lives
 if (Astro.url.searchParams.get('start')) {
-  return Astro.redirect(`${bookingLinkUrl(resource.slug, link.slug)}${Astro.url.search}`);
+  const search = new URLSearchParams(Astro.url.search);
+  search.delete('lang');
+  return Astro.redirect(`${localePath(bookingLinkUrl(resource.slug, link.slug), locale)}?${search}`);
 }
 const ctx = await availabilityContext(repo, resource, link, settings);
 Astro.response.headers.set('Content-Security-Policy', 'frame-ancestors *');
 ---
 
-<Site title={link.name} bare noindex>
-  <BookingFlow resource={resource} link={link} ctx={ctx} settings={settings} url={Astro.url} embed />
+<Site title={linkWords(link, locale).name} bare noindex>
+  <BookingFlow resource={resource} link={link} ctx={ctx} settings={settings} url={Astro.url} embed locale={locale} />
   <script is:inline>
     (function () {
       var send = function () { parent.postMessage({ acmsBookingEmbed: true, height: document.documentElement.scrollHeight }, '*'); };

package/src/pages/search.astro

@@ -7,7 +7,7 @@ import { authorSlug } from '../lib/schema';
 import { I18N, localeFromPath, localeHomeUrl, normalizePageLocale } from '../lib/i18n';
 import { searchStrings } from '../lib/search-i18n';
 import { CALENDAR, eventUrl } from '../lib/calendar/config';
-import { eventIsPublic, featuredOccurrence, formatOccurrence } from '../lib/calendar/events';
+import { eventIsSearchable, featuredOccurrence, formatOccurrence } from '../lib/calendar/events';
 import { siteLocale } from '../lib/dates';
 
 // The no-JS search surface (the modal's form falls back here). Serves both
@@ -25,7 +25,7 @@ const results = q
   ? await repo.searchPublished(q, { locale })
   : { posts: [], pages: [], events: [], tags: [], authors: [] };
 const calMap = new Map((await repo.listCalendars()).map((c) => [c.id, c]));
-const events = CALENDAR.enabled ? results.events.filter(({ doc }) => eventIsPublic(doc, calMap)).slice(0, 10) : [];
+const events = CALENDAR.enabled ? results.events.filter(({ doc }) => eventIsSearchable(doc, calMap)).slice(0, 10) : [];
 const total = results.posts.length + results.pages.length + events.length + results.tags.length + results.authors.length;
 ---