@acms-subir/core 0.3.57 → 0.3.59

package/src/lib/calendar/google/outbound.ts

@@ -8,14 +8,22 @@
 // title. Only the fields the sync owns are patched; guests are never added
 // and Google never emails anyone (sendUpdates=none).
 //
+// A series changed "from this date on" (CalEvent.segments) is one Google
+// series per part, as Google does for "this and following": the first part's
+// rule stops where the next takes over, and each later part is its own
+// series (a segment pair, its hidden link naming its `from`). A cancelled
+// part has no Google copy (its dates are removed in Google, like a cancelled
+// date's instance), and a part the site took back is removed from Google.
+//
 // A change that already matches what the pair agreed is never sent, which is
 // what stops loops: the site's write of a change that came from Google leaves
 // nothing to send back to that link (only to the event's other links).
 import { hasTag, type CalEvent } from '../../schema';
+import { seriesParts, type SeriesPart } from '../events';
 import type { SyncContext } from './context';
 import { entry } from './context';
 import { GoogleError } from './client';
-import { applyGoogleChange } from './inbound';
+import { applyGoogleChange, applySegmentChange } from './inbound';
 import {
   BOOKING_TAG, NONE, changed, dateHash, fieldHashes, fieldWord, googleBody, googleFields, googleIdFor, googlePatch, inWindow, instanceBody,
   instanceState, keyStart, linkCarries, originalStart, siteFields, windowStart, type DateState, type Fields,
@@ -96,8 +104,43 @@ async function pushToLink(ctx: SyncContext, link: GcalLink, e: CalEvent | null,
   // deleted from this Google calendar while the event stays in its other copies: it stays out
   if (main.leftOut) return;
   // deleted in Google (and so cancelled here, Q6): made again only once the site brings it back
-  if (main.gone) { if (!e.cancelled) await createCopy(ctx, link, e, main); return; }
-  await updateCopy(ctx, link, e, main, mine.some((i) => i.kind === 'segment'));
+  if (main.gone) { if (!e.cancelled) await createCopy(ctx, link, e, main); }
+  else await updateCopy(ctx, link, e, main);
+  if (e.rrule || mine.some((i) => i.kind === 'segment')) {
+    // as they are now (taking Google's changes may have written the event)
+    const fresh = await ctx.repo.getEvent(e.id);
+    if (fresh) await pushParts(ctx, link, fresh, (await ctx.repo.gcal.itemsForEvent(e.id)).filter((i) => i.linkId === link.id));
+  }
+}
+
+/** The later parts of a series changed from a date on: one Google series each. */
+async function pushParts(ctx: SyncContext, link: GcalLink, e: CalEvent, mine: GcalItem[]) {
+  const parts = e.rrule ? seriesParts(e).slice(1) : [];
+  const segments = mine.filter((i) => i.kind === 'segment');
+  for (const p of parts) {
+    const item = segments.find((i) => i.segmentFrom === p.from);
+    if (p.cancelled) {
+      // its dates are cancelled: removed in Google (kept as the pair, so restoring the part makes it again)
+      if (item && !item.gone) {
+        await ctx.client.deleteEvent(link.googleId, item.googleId);
+        await ctx.repo.gcal.patchItem(link.id, item.googleId, { gone: true, leftOut: false, syncedAt: ctx.now });
+        await ctx.repo.gcal.log([entry(link, item, e.title, { direction: 'out', action: 'removed', summary: `Dates from ${p.from.replace('T', ' ')} on cancelled on the site: removed from ${link.googleName}.` })], ctx.now);
+      }
+      continue;
+    }
+    if (!item) await createCopy(ctx, link, e, undefined, p);
+    else if (item.gone) await createCopy(ctx, link, e, item, p);
+    else await updateCopy(ctx, link, e, item, p);
+  }
+  for (const item of segments) {
+    if (parts.some((p) => p.from === item.segmentFrom)) continue;
+    // a split Google had at the first match, never on the site: Google keeps it as it is
+    if (!Object.keys(item.site).length) continue;
+    // the site took that change back ("Undo"): its Google series goes
+    if (!item.gone) await ctx.client.deleteEvent(link.googleId, item.googleId);
+    await ctx.repo.gcal.deleteItem(link.id, item.googleId);
+    await ctx.repo.gcal.log([entry(link, item, e.title, { direction: 'out', action: 'removed', summary: `The change from ${item.segmentFrom.replace('T', ' ')} on was undone on the site: its series was removed from ${link.googleName}.` })], ctx.now);
+  }
 }
 
 /** Google won't let the account change this event there: listed once, and the site's change counts as seen (no retries). */
@@ -115,7 +158,7 @@ async function unpair(ctx: SyncContext, link: GcalLink, item: GcalItem, e: CalEv
 }
 
 async function removeCopy(ctx: SyncContext, link: GcalLink, item: GcalItem, all: GcalItem[], e: CalEvent | null) {
-  // the event's later parts from a Google split go with it
+  // the event's later parts (their own Google series) go with it
   for (const i of all) {
     if (!i.gone) await ctx.client.deleteEvent(link.googleId, i.googleId);
     await ctx.repo.gcal.deleteItem(link.id, i.googleId);
@@ -151,18 +194,19 @@ function written(patch: Record<string, unknown>, rules: GcalLink['rules']): stri
 }
 const masterHashes = (h: Hashes) => Object.fromEntries(Object.entries(h).filter(([k]) => !k.startsWith('date:')));
 
-/** A new Google copy (or a new one after Google deleted the old: `previous`), with the series' changed dates. */
-export async function createCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, previous?: GcalItem) {
-  const f = siteFields(e, link, ctx.map);
-  const body = googleBody(e, f, link, ctx.map, { desc: true });
-  const id = googleIdFor(e.id, previous ? Math.floor(ctx.now / 1000) : 0);
+/** A new Google copy (or a new one after Google deleted the old: `previous`), with the series' changed dates; `part`: a later part's own series. */
+export async function createCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, previous?: GcalItem, part?: SeriesPart) {
+  const f = siteFields(e, link, ctx.map, part);
+  const segment = part?.from ?? '';
+  const body = googleBody(e, f, link, ctx.map, { desc: true, segment });
+  const id = googleIdFor(e.id, previous ? Math.floor(ctx.now / 1000) : 0, segment);
   let g: GoogleEvent;
   try { g = await ctx.client.insertEvent(link.googleId, id ? { id, ...body } : body); }
   catch (err) {
     if (!(err instanceof GoogleError && err.code === 'conflict' && id)) throw err;
     // that id is taken: our own copy from a run that stopped before saving the pair, or one Google deleted (ids stay taken)
     const found = await ctx.client.getEvent(link.googleId, id).catch(() => null);
-    g = found && found.status !== 'cancelled' && found.extendedProperties?.private?.acmsEventId === e.id
+    g = found && found.status !== 'cancelled' && found.extendedProperties?.private?.acmsEventId === e.id && (found.extendedProperties.private.acmsSegment ?? '') === segment
       ? await ctx.client.patchEvent(link.googleId, id, body)
       : await ctx.client.insertEvent(link.googleId, body);
   }
@@ -177,12 +221,13 @@ export async function createCopy(ctx: SyncContext, link: GcalLink, e: CalEvent,
     else google[`date:${key}`] = dateHash(after);
   }
   const item: GcalItem = {
-    linkId: link.id, googleId: g.id, eventId: e.id, icalUid: g.iCalUID ?? '', kind: e.rrule ? 'series' : 'single', segmentFrom: '', etag: g.etag ?? '', htmlLink: g.htmlLink ?? '',
+    linkId: link.id, googleId: g.id, eventId: e.id, icalUid: g.iCalUID ?? '', kind: segment ? 'segment' : e.rrule ? 'series' : 'single', segmentFrom: segment, etag: g.etag ?? '', htmlLink: g.htmlLink ?? '',
     site: fieldHashes(f), google, descGoogle: false, booking: false, gone: false, leftOut: false, conflict: null, syncedAt: ctx.now, createdAt: previous?.createdAt ?? ctx.now,
   };
   if (previous) await ctx.repo.gcal.replaceItem(previous.googleId, item); else await ctx.repo.gcal.putItem(item);
   await ctx.repo.gcal.log([entry(link, item, e.title, { direction: 'out', action: 'created',
-    summary: previous ? `Back on the site: made again in ${link.googleName}.` : `Copied to ${link.googleName}${e.cancelled ? ' as cancelled' : ''}.` }), ...notes], ctx.now);
+    summary: segment ? `From ${segment.replace('T', ' ')} on, a series of its own in ${link.googleName} (“this and following”).`
+      : previous ? `Back on the site: made again in ${link.googleName}.` : `Copied to ${link.googleName}${e.cancelled ? ' as cancelled' : ''}.` }), ...notes], ctx.now);
 }
 
 /** Sets one date of the Google series; returns its state there afterwards (null: Google has no such date). */
@@ -207,9 +252,11 @@ async function writeDate(ctx: SyncContext, link: GcalLink, masterId: string, key
   }
 }
 
-/** Sends the site's changes since the pair last agreed (Google's own changes are taken first, field by field). */
-async function updateCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, item: GcalItem, split: boolean) {
-  let f = siteFields(e, link, ctx.map);
+/** Sends the site's changes since the pair last agreed (Google's own changes are taken first, field by field); `part`: a later part's series. */
+async function updateCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, item: GcalItem, part?: SeriesPart) {
+  const partFrom = part?.from;
+  const partNow = (ev: CalEvent) => (partFrom === undefined ? undefined : seriesParts(ev).find((p) => p.from === partFrom));
+  let f = siteFields(e, link, ctx.map, part);
   if (!pendingSite(fieldHashes(f), item, link, {}).ch.length) return;
   let g: GoogleEvent | null = await ctx.client.getEvent(link.googleId, item.googleId).catch((err) => {
     if (err instanceof GoogleError && (err.code === 'notfound' || err.code === 'gone')) return null;
@@ -223,10 +270,12 @@ async function updateCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, item: G
   let gf = googleFields(g, link, ctx.settings);
   // Google changed fields too: take those first (the site wins where both changed, Q4), then send what's left
   if (link.direction === 'both' && gf && changed(masterHashes(fieldHashes(gf)), masterHashes(item.google)).length) {
-    await applyGoogleChange(ctx, link, item, g);
+    await (part ? applySegmentChange(ctx, link, item, g) : applyGoogleChange(ctx, link, item, g));
     const [again, fresh] = await Promise.all([ctx.repo.gcal.getItem(link.id, item.googleId), ctx.repo.getEvent(e.id)]);
     if (!again || !fresh || again.gone) return;
-    item = again; e = fresh; f = siteFields(e, link, ctx.map);
+    item = again; e = fresh;
+    if (part) { part = partNow(e); if (!part || part.cancelled) return; }
+    f = siteFields(e, link, ctx.map, part);
   }
   const cur = fieldHashes(f);
   const pending = pendingSite(cur, item, link, gf ? fieldHashes(gf) : {});
@@ -239,10 +288,7 @@ async function updateCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, item: G
     descGoogle = false;
     notes.push(entry(link, item, e.title, { direction: 'info', action: 'description', summary: 'Description edited on the site: from now on Google gets the site’s text (Q8).' }));
   }
-  // a series Google split ("this and following") keeps its time and rule until the site has "from this date on"
-  const held: string[] = split ? ch.filter((n) => n === 'when' || n === 'repeat') : [];
-  if (held.length) notes.push(entry(link, item, e.title, { direction: 'info', action: 'split', summary: `${held.map(fieldWord).join(' and ')} changed on the site, but Google split this series (“this and following”), so ${held.length > 1 ? 'they weren’t' : 'it wasn’t'} sent. Change the later part in Google, or both by hand.` }));
-  const fields = ch.filter((n) => !n.startsWith('date:') && !held.includes(n) && !((n === 'desc' || n === 'link') && descGoogle));
+  const fields = ch.filter((n) => !n.startsWith('date:') && !((n === 'desc' || n === 'link') && descGoogle));
   const patch = fields.length ? googlePatch(e, f, link, ctx.map, fields, { desc: !descGoogle, googleSummary: g.summary ?? '' }) : {};
   if (Object.keys(patch).length) g = await ctx.client.patchEvent(link.googleId, item.googleId, patch);
   gf = googleFields(g, link, ctx.settings) ?? gf;
@@ -252,7 +298,7 @@ async function updateCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, item: G
 
   // single dates, once the series itself is right (read in the site event's zone, where its keys are)
   const inSiteZone = googleFields(g, link, ctx.settings, f.when.tz);
-  if (!split && inSiteZone) for (const n of ch.filter((x) => x.startsWith('date:'))) {
+  if (inSiteZone) for (const n of ch.filter((x) => x.startsWith('date:'))) {
     const key = n.slice(5);
     if (keyStart(key, f.when, ctx.settings) <= ctx.now) continue;
     const want = f.dates[key] ?? 'none';
@@ -265,8 +311,8 @@ async function updateCopy(ctx: SyncContext, link: GcalLink, e: CalEvent, item: G
   for (const n of ch) { if (cur[n] === undefined) delete site[n]; else site[n] = cur[n]; }
   // the clash note stays until the site edits that field again (sending the site's winning value isn't an edit)
   const conflict = !item.conflict || !ch.includes(item.conflict.field) ? item.conflict : item.conflict.sent ? null : { ...item.conflict, sent: true };
-  await ctx.repo.gcal.patchItem(link.id, item.googleId, { site, google, descGoogle, conflict, etag: g.etag ?? item.etag, htmlLink: g.htmlLink ?? item.htmlLink, kind: e.rrule ? 'series' : 'single', syncedAt: ctx.now });
-  const sent = [...new Set(ch.filter((n) => !held.includes(n)).map((n) => n.startsWith('date:') ? 'dates' : n.startsWith('rule:') ? 'title' : n === 'status' ? (e.cancelled ? 'cancelled' : 'restored') : n === 'link' ? 'desc' : n))];
-  if (sent.length) notes.unshift(entry(link, item, e.title, { direction: 'out', action: 'updated', summary: `${sent.map((n) => n === 'dates' ? 'Single dates' : n === 'cancelled' ? 'Cancelled' : n === 'restored' ? 'No longer cancelled' : fieldWord(n)).join(', ')} → ${link.googleName}` }));
+  await ctx.repo.gcal.patchItem(link.id, item.googleId, { site, google, descGoogle, conflict, etag: g.etag ?? item.etag, htmlLink: g.htmlLink ?? item.htmlLink, kind: part ? 'segment' : e.rrule ? 'series' : 'single', syncedAt: ctx.now });
+  const sent = [...new Set(ch.map((n) => n.startsWith('date:') ? 'dates' : n.startsWith('rule:') ? 'title' : n === 'status' ? (e.cancelled ? 'cancelled' : 'restored') : n === 'link' ? 'desc' : n))];
+  if (sent.length) notes.unshift(entry(link, item, e.title, { direction: 'out', action: 'updated', summary: `${sent.map((n) => n === 'dates' ? 'Single dates' : n === 'cancelled' ? 'Cancelled' : n === 'restored' ? 'No longer cancelled' : fieldWord(n)).join(', ')}${part ? ` (from ${part.from.replace('T', ' ')} on)` : ''} → ${link.googleName}` }));
   await ctx.repo.gcal.log(notes, ctx.now);
 }

package/src/lib/calendar/ics-write.ts

@@ -93,8 +93,9 @@ export function eventToVevent(e: CalEvent, siteTz: string, opts: FeedOptions): s
 // A part's rule for the feed: stopped just before the next part's `from`
 // (RFC 5545 UNTIL is inclusive: the instant before it for timed events, the
 // day before for all-day ones). COUNT becomes that UNTIL when the rule would
-// still have dates there; null when the part has none left before it.
-function ruleUntil(e: CalEvent, p: SeriesPart, siteTz: string): string | null {
+// still have dates there; null when the part has none left before it. The
+// Google Calendar sync gives each part's Google series the same rule.
+export function ruleUntil(e: CalEvent, p: SeriesPart, siteTz: string): string | null {
   const clean = cleanRrule(p.rrule);
   if (!p.until || !clean) return clean;
   const cut = parseWall(p.until);

package/src/lib/calendar/request-mail.ts

@@ -1,5 +1,6 @@
 import type { ContentRepository } from '../repo/types';
 import type { RequestRecord, Settings } from '../schema';
+import { roomName } from '../schema';
 import type { Mail } from '../email/types';
 import { siteLang, siteLocale } from '../dates';
 import { I18N, localeName } from '../i18n';
@@ -66,7 +67,7 @@ async function personSummary(repo: ContentRepository, q: RequestRecord, settings
   const parts = [
     requestWhen(d.start, d.end, settings, locale),
     ...(d.repeat === 'weekly' ? [w.weekly] : []),
-    d.roomIds.map((id) => rooms.find((r) => r.id === id)?.name).filter(Boolean).join(', '),
+    d.roomIds.map((id) => rooms.find((r) => r.id === id)).filter((r) => r !== undefined).map((r) => roomName(r, lang)).join(', '),
     d.people ? fill(w.aboutPeople, { count: String(d.people) }) : '',
     type ? (lang && type.translations[lang]) || type.label : '',
   ].filter(Boolean);

package/src/lib/calendar/request-page.ts

@@ -1,5 +1,6 @@
 import type { ContentRepository } from '../repo/types';
 import type { RequestRecord, Settings } from '../schema';
+import { roomName } from '../schema';
 import { requestWhen } from './request-mail';
 import { requestSettings, type NewEventDetails, type RequestInput } from './request-service';
 import { requestStrings } from './request-words';
@@ -44,7 +45,7 @@ export async function sentSummary(repo: ContentRepository, q: RequestRecord, set
   const line = [
     requestWhen(d.start, d.end, settings, locale),
     d.repeat === 'weekly' ? w.weekly : d.repeat === 'other' ? d.repeatText : '',
-    d.roomIds.map((id) => rooms.find((r) => r.id === id)?.name).filter(Boolean).join(', '),
+    d.roomIds.map((id) => rooms.find((r) => r.id === id)).filter((r) => r !== undefined).map((r) => roomName(r, lang)).join(', '),
     d.people ? fill(w.aboutPeople, { count: String(d.people) }) : '',
     type ? (lang && type.translations[lang]) || type.label : '',
   ].filter(Boolean).join(' · ');

package/src/lib/calendar/request-service.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { ContentRepository } from '../repo/types';
-import { RequestRecord, RoomHold, type CalEvent, type RequestSettings, type Resource, type Settings } from '../schema';
+import { RequestRecord, RoomHold, roomName, type CalEvent, type RequestSettings, type Resource, type Settings } from '../schema';
 import { ApiError, coded } from '../api';
 import { sha256Hex } from '../api-keys';
 import { validAddress } from '../email/config';
@@ -139,7 +139,7 @@ export async function requestOptions(repo: ContentRepository, locale = '', now =
   return {
     open: rq.open,
     types: rq.types.map((t) => ({ id: t.id, label: typeLabel(t, lang) })),
-    rooms: (await requestableRooms(repo)).map((r) => ({ slug: r.slug, name: r.name, color: /^#[0-9a-f]{6}$/i.test(r.color) ? r.color.toLowerCase() : '' })),
+    rooms: (await requestableRooms(repo)).map((r) => ({ slug: r.slug, name: roomName(r, lang), color: /^#[0-9a-f]{6}$/i.test(r.color) ? r.color.toLowerCase() : '' })),
     replyTime: words?.replyTime || rq.replyTime,
     notice: words?.notice || rq.notice,
     phone: rq.phone,

package/src/lib/display/board.ts

@@ -6,7 +6,7 @@
 // bookings of its rooms with the booker's name, the rooms and hosts of every
 // event. Never emails, phone numbers, notes or RSVP lists.
 import type { ContentRepository } from '../repo/types';
-import { roomColor, type Resource, type Settings } from '../schema';
+import { roomColor, roomName, type Resource, type Settings } from '../schema';
 import { collectViewEvents, type ViewEvent } from '../calendar/data';
 import { eventFilterQuery, resolveEventFilter } from '../calendar/filter';
 import { tzParts, zonedToUtc } from '../calendar/ics';
@@ -53,7 +53,8 @@ export function displayLocale(site: Pick<Settings, 'locale'>, lang: string): str
   try { return Intl.DateTimeFormat.supportedLocalesOf([wanted]).length ? wanted : lang; } catch { return lang; }
 }
 
-const asRoom = (r: Resource): DisplayRoom => ({ id: r.id, slug: r.slug, name: r.name, color: roomColor(r) });
+// named in the board's language (its main name without one)
+const asRoom = (lang: string) => (r: Resource): DisplayRoom => ({ id: r.id, slug: r.slug, name: roomName(r, lang), color: roomColor(r) });
 
 /** the days a board covers, and (month) its weeks */
 export function boardDays(s: DisplaySettings, today: Iso, siteWeekStart: 0 | 1): { days: Iso[]; weeks: Iso[][] } {
@@ -115,7 +116,7 @@ export async function loadDisplayBoard(repo: ContentRepository, site: Settings,
   });
   // rooms visitors may see: the ones named on public events
   const allowed = resources.filter((r) => req.privateDetails || r.showOnEvents);
-  const roomById = new Map(allowed.map((r) => [r.id, asRoom(r)]));
+  const roomById = new Map(allowed.map((r) => [r.id, asRoom(lang)(r)]));
   const calById = new Map(shownCalendars.map((c) => [c.id, c]));
   // a person invited without a name has their email as one: never on a TV
   const hostName = req.privateDetails && s.show.includes('host')
@@ -135,11 +136,11 @@ export async function loadDisplayBoard(repo: ContentRepository, site: Settings,
   // every room the board may show (resources of kind "Room", else all)
   let rooms: DisplayRoom[] = [];
   if (s.view === 'rooms') {
-    if (filter.roomIds) rooms = filter.rooms.map(asRoom);
+    if (filter.roomIds) rooms = filter.rooms.map(asRoom(lang));
     else {
       const sorted = [...allowed].sort((a, b) => a.order - b.order || a.name.localeCompare(b.name));
       const kindRoom = sorted.filter((r) => r.kind.trim().toLowerCase() === 'room');
-      rooms = (kindRoom.length ? kindRoom : sorted).map(asRoom);
+      rooms = (kindRoom.length ? kindRoom : sorted).map(asRoom(lang));
     }
   }
   const hours = s.hours === 'auto' ? autoHours(visible, days) : s.hours;

package/src/lib/editor/schedule.ts

@@ -177,6 +177,8 @@ export const ResourceInput = z.object({
   // '' = no colour; public event data names it only with showOnEvents; requestable answers GET /api/v1/rooms/free
   color: z.union([z.literal(''), z.string().regex(/^#[0-9a-fA-F]{6}$/, 'Use a colour like #2f6fde.')]).optional(),
   showOnEvents: z.boolean().optional(), requestable: z.boolean().optional(),
+  // its name in the site's other languages: { es: { name: 'Salón de jóvenes' } } ('' = the main name)
+  translations: z.record(z.string().regex(/^[a-z]{2,3}(-[a-z0-9]{2,8})?$/), z.object({ name: z.string().trim().max(120) })).optional(),
   // ICS / Google calendars whose events block this room (fetched like calendar feeds)
   busyFeeds: z.array(z.string().max(2000)).max(10).optional(),
   notifyEmails: z.array(z.string().trim().email().max(200)).max(10).optional(),

package/src/lib/mobile/calendar.ts

@@ -77,7 +77,7 @@ export async function listEvents(repo: ContentRepository, url: URL) {
   return {
     locale, timezone: settings.timezone || 'UTC', from: new Date(from).toISOString(), to: new Date(to).toISOString(),
     occurrences: occurrences.slice(start, start + q.limit).map(o => ({
-      ...occurrenceDto(o, resources),
+      ...occurrenceDto(o, resources, locale || siteLang(settings)),
       event: publicEventDto(o.event, origin, publicCalendars, settings, locale, resources),
     })),
     pagination: { page: q.page, limit: q.limit, nextPage: occurrences.length > start + q.limit ? q.page + 1 : null },
@@ -101,20 +101,20 @@ export async function getEventDetail(repo: ContentRepository, url: URL, ref: str
   const publicCalendars = new Map(calendars.filter(c => c.visibility === 'public').map(c => [c.id, c]));
   return {
     locale,
-    occurrence: o ? occurrenceDto(o, resources) : null,
+    occurrence: o ? occurrenceDto(o, resources, locale || siteLang(settings)) : null,
     event: publicEventDto(e, siteOrigin(settings, url), publicCalendars, settings, locale, resources),
   };
 }
 /** every room by id, for naming the public ones (Resource.showOnEvents) */
 export const roomMap = async (repo: ContentRepository) => new Map((await repo.listResources()).map((r) => [r.id, r]));
-// one date: its time, whether it's cancelled, where it moved from, and the public rooms it holds
-export function occurrenceDto(o: Occurrence, resources: Map<string, Resource>) {
+// one date: its time, whether it's cancelled, where it moved from, and the public rooms it holds (named in `locale`)
+export function occurrenceDto(o: Occurrence, resources: Map<string, Resource>, locale?: string | null) {
   const iso = (n: number) => new Date(n).toISOString();
   return { id: `${o.event.id}:${o.start}`, start: iso(o.start), end: iso(o.end), allDay: o.allDay, cancelled: o.cancelled,
     moved: o.moved ? { from: { start: iso(o.moved.from.start), end: iso(o.moved.from.end) }, note: o.moved.note,
       location: o.moved.location ? { name: o.moved.location.name, address: o.moved.location.address, url: o.moved.location.url } : null } : null,
     location: o.location ? { name: o.location.name, address: o.location.address, url: o.location.url } : null,
-    rooms: roomsToJson(o.roomIds, resources) };
+    rooms: roomsToJson(o.roomIds, resources, false, locale) };
 }
 // e is already localized; publicCalendars limits which calendars are named
 export function publicEventDto(e: CalEvent, origin: string, publicCalendars: Map<string, Calendar>, settings: Settings, locale: string | null, resources?: Map<string, Resource>) {

package/src/lib/mobile/search.ts

@@ -3,6 +3,7 @@ import type { ContentRepository } from '../repo/types';
 import { CONTENT } from '../content';
 import { normalizePageLocale } from '../i18n';
 import { siteOrigin } from '../seo';
+import { siteLang } from '../dates';
 import { SEARCH } from '../search-config';
 import { CALENDAR } from '../calendar/config';
 import { eventIsListed, featuredOccurrence } from '../calendar/events';
@@ -85,7 +86,7 @@ export async function search(repo: ContentRepository, url: URL) {
       return {
         snippet: plainSnippet(snippet),
         // the next occurrence, or the latest one when the event is over
-        occurrence: o ? (({ id: _, ...rest }) => rest)(occurrenceDto(o, resources)) : null,
+        occurrence: o ? (({ id: _, ...rest }) => rest)(occurrenceDto(o, resources, locale || siteLang(settings))) : null,
         event: publicEventDto(e, origin, listed, settings, locale, resources),
       };
     }),

package/src/lib/repo/migrations.ts

@@ -741,6 +741,13 @@ export const MIGRATIONS: Migration[] = [
   // a series changed from one date on (CalEvent.segments): a column on the
   // row, so the triggers on events see it, like moved_dates
   SEGMENTS_MIGRATION(contentVersionTriggers('events', [...CONTENT_VERSION_COLUMNS.events, 'cancelled_dates', 'moved_dates', 'segments'])[2]),
+  // a room's name in other languages (Resource.translations): public, so a
+  // change refreshes cached pages and API answers
+  { version: 71, statements: [
+    `ALTER TABLE resources ADD COLUMN translations TEXT NOT NULL DEFAULT '{}'`,
+    `DROP TRIGGER content_version_resources_update`,
+    contentVersionTriggers('resources', [...CONTENT_VERSION_COLUMNS.resources, 'color', 'show_on_events', 'translations'])[2],
+  ] },
 ];
 
 // Current cache coverage; keep earlier migration inputs frozen for upgrade compatibility.
@@ -748,7 +755,7 @@ export const CURRENT_CONTENT_VERSION_COLUMNS = {
   ...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'],
+  resources: [...CONTENT_VERSION_COLUMNS.resources, 'color', 'show_on_events', 'translations'],
   announcements: ANNOUNCEMENT_VISIBLE_COLUMNS,
 };
 

package/src/lib/repo/sql.ts

@@ -189,6 +189,11 @@ function rowToEvent(r: Row): CalEvent {
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
+// a room's names in other languages; a bad entry (or a broken column) reads as untranslated
+function roomTranslations(raw: unknown): Resource['translations'] {
+  const parsed = Resource.shape.translations.safeParse(json(raw, {}));
+  return parsed.success ? parsed.data : {};
+}
 function rowToResource(r: Row): Resource {
   return Resource.parse({
     id: r.id, slug: r.slug, name: r.name, kind: r.kind ?? 'Room', description: r.description ?? '', photo: r.photo ?? '',
@@ -196,7 +201,7 @@ function rowToResource(r: Row): Resource {
     amenities: json(r.amenities, []), timezone: r.timezone ?? '', hours: json(r.hours, {}), overrides: json(r.overrides, []),
     busyFeeds: json(r.busy_feeds, []), notifyEmails: json(r.notify_emails, []), visibility: r.visibility ?? 'public',
     showOnCalendar: Boolean(r.show_on_calendar), feedToken: r.feed_token ?? '', placeId: r.place_id ?? '', order: Number(r.ord ?? 0),
-    color: r.color ?? '', showOnEvents: Boolean(r.show_on_events), requestable: Boolean(r.requestable),
+    color: r.color ?? '', showOnEvents: Boolean(r.show_on_events), requestable: Boolean(r.requestable), translations: roomTranslations(r.translations),
     createdAt: Number(r.created_at), updatedAt: Number(r.updated_at),
   });
 }
@@ -1160,10 +1165,10 @@ export class SqlRepository implements ContentRepository {
   private resourceInsert(r: Resource): SqlStatement {
     return {
       sql: `INSERT INTO resources (id, slug, name, kind, description, photo, capacity, amenities, timezone, hours, overrides, busy_feeds,
-        notify_emails, visibility, show_on_calendar, feed_token, ord, created_at, updated_at, place_id, color, show_on_events, requestable) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        notify_emails, visibility, show_on_calendar, feed_token, ord, created_at, updated_at, place_id, color, show_on_events, requestable, translations) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       args: [r.id, r.slug, r.name, r.kind, r.description, r.photo, r.capacity, JSON.stringify(r.amenities), r.timezone, JSON.stringify(r.hours),
         JSON.stringify(r.overrides), JSON.stringify(r.busyFeeds), JSON.stringify(r.notifyEmails), r.visibility, r.showOnCalendar ? 1 : 0,
-        r.feedToken || randomToken(), r.order, r.createdAt, r.updatedAt, r.placeId, roomColor(r), r.showOnEvents ? 1 : 0, r.requestable ? 1 : 0],
+        r.feedToken || randomToken(), r.order, r.createdAt, r.updatedAt, r.placeId, roomColor(r), r.showOnEvents ? 1 : 0, r.requestable ? 1 : 0, JSON.stringify(r.translations)],
     };
   }
   private linkInsert(l: BookingLink): SqlStatement {
@@ -1215,10 +1220,10 @@ export class SqlRepository implements ContentRepository {
     await this.driver.run(
       `UPDATE resources SET slug = ?, name = ?, kind = ?, description = ?, photo = ?, capacity = ?, amenities = ?, timezone = ?, hours = ?,
         overrides = ?, busy_feeds = ?, notify_emails = ?, visibility = ?, show_on_calendar = ?, feed_token = ?, place_id = ?,
-        color = ?, show_on_events = ?, requestable = ?, updated_at = ? WHERE id = ?`,
+        color = ?, show_on_events = ?, requestable = ?, translations = ?, updated_at = ? WHERE id = ?`,
       [r.slug, r.name, r.kind, r.description, r.photo, r.capacity, JSON.stringify(r.amenities), r.timezone, JSON.stringify(r.hours),
         JSON.stringify(r.overrides), JSON.stringify(r.busyFeeds), JSON.stringify(r.notifyEmails), r.visibility, r.showOnCalendar ? 1 : 0,
-        r.feedToken, r.placeId, roomColor(r), r.showOnEvents ? 1 : 0, r.requestable ? 1 : 0, r.updatedAt, id]
+        r.feedToken, r.placeId, roomColor(r), r.showOnEvents ? 1 : 0, r.requestable ? 1 : 0, JSON.stringify(r.translations), r.updatedAt, id]
     );
   }
   async reorderResources(ids: string[]) {

package/src/lib/schema.ts

@@ -611,6 +611,9 @@ export const Resource = z.object({
   // anyone may ask whether it's free at a time (GET /api/v1/rooms/free: free or
   // busy, never what or who)
   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({}),
   // secret for the staff feed /book/<slug>.ics?t=… (bookings with names)
   feedToken: z.string().default(''),
   // the saved place this room is in ('' = none)
@@ -622,6 +625,13 @@ export const Resource = z.object({
 export type Resource = z.infer<typeof Resource>;
 /** A room's colour as #rrggbb, or '' when it has none (anything else stored reads as none). */
 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;
+}
 
 // A saved place (HQ, the park pavilion…): picked in an event's Where field,
 // it copies its details into the event. Rooms can belong to one (resource.placeId).

package/src/lib/sections.ts

@@ -128,7 +128,8 @@ async function resolveSource(field: Extract<FieldDef, { type: 'source' }>, value
     }
     const tz = settings.timezone || 'UTC';
     const locale = siteLocale(settings);
-    return (await upcomingEvents(repo, settings, now, { calendarIds, limit, tag: cfg.tag, excludeTag: cfg.excludeTag })).map((o): EventItem => {
+    // in the page's language: the dates' rooms come named in it
+    return (await upcomingEvents(repo, settings, now, { calendarIds, limit, tag: cfg.tag, excludeTag: cfg.excludeTag, locale: lang || undefined })).map((o): EventItem => {
       const e = lang ? localizeDoc(o.event, lang) : o.event;
       const f = formatOccurrence(o, tz, locale);
       const was = o.moved ? formatOccurrence({ ...o, start: o.moved.from.start, end: o.moved.from.end }, tz, locale) : null;

package/src/pages/admin/calendar/resources/[id].astro

@@ -13,6 +13,7 @@ import { approvalShort, linkApproval } from '../../../../lib/booking/approval';
 import { eventHolds } from '../../../../lib/booking/holds';
 import { fmt } from '../../../../lib/booking/view';
 import { forbiddenUnless } from '../../../../lib/permissions/access';
+import { extraLocales, localeName } from '../../../../lib/i18n';
 
 // One resource: details, weekly hours, date overrides, calendars that block
 // time, who gets notified, the staff feed, and its booking links.
@@ -36,6 +37,12 @@ if (Astro.request.method === 'POST') {
   const op = String(form.get('op'));
   if (op === 'save') {
     const name = String(form.get('name') || '').trim().slice(0, 120) || resource.name;
+    // its name in each of the site's other languages ('' = the main name); languages no longer configured keep theirs
+    const translations = { ...resource.translations };
+    for (const l of extraLocales()) {
+      const n = String(form.get('name_' + l) || '').trim().slice(0, 120);
+      if (n) translations[l] = { name: n }; else delete translations[l];
+    }
     const base = slugify(String(form.get('slug') || name));
     let slug = base;
     for (let n = 2; ; n++) { const hit = await repo.getResourceBySlug(slug); if (!hit || hit.id === id) break; slug = `${base}-${n}`; }
@@ -53,6 +60,7 @@ if (Astro.request.method === 'POST') {
       timezone: tz && isValidTimeZone(tz) ? tz : '',
       visibility: form.get('visibility') === 'unlisted' ? 'unlisted' : 'public',
       showOnCalendar: Boolean(form.get('showOnCalendar')),
+      translations,
       color: form.get('noColor') ? '' : roomColor({ color: String(form.get('color') || '') }),
       showOnEvents: Boolean(form.get('showOnEvents')),
       requestable: Boolean(form.get('requestable')),
@@ -160,6 +168,9 @@ const ovRows = [...resource.overrides, { date: '', endDate: '', ranges: [], labe
       <section class="card card-pad">
         <div class="card-head"><b>Details</b></div>
         <label class="field"><span>Name</span><input type="text" name="name" value={resource.name} required /></label>
+        {extraLocales().map((l) => (
+          <label class="field"><span>Name in {localeName(l)} <em class="hint">optional; shown on {localeName(l)} pages and in the app</em></span><input type="text" name={'name_' + l} lang={l} maxlength="120" value={resource.translations[l]?.name ?? ''} placeholder={resource.name} /></label>
+        ))}
         <div class="field-row">
           <label class="field"><span>Kind</span><input type="text" name="kind" list="res-kinds" value={resource.kind} /></label>
           <label class="field"><span>Capacity</span><input type="number" name="capacity" min="1" value={resource.capacity ?? ''} /></label>

package/src/pages/members/events/index.astro

@@ -17,6 +17,7 @@ import { mergeEventDraft } from '../../../lib/drafts';
 import { fill } from '../../../lib/live/words';
 import { localizeDoc } from '../../../lib/translations';
 import type { CalEvent, RequestRecord } from '../../../lib/schema';
+import { roomName as nameIn } from '../../../lib/schema';
 import type { MoveInput } from '../../../lib/calendar/moves';
 import { failure, keepPrivate, memberLanguage, notFound, redirectTo, signInRedirect } from '../_http';
 
@@ -186,7 +187,8 @@ const wallParts = (e: CalEvent, ms: number) => {
   const p = tzParts(ms, e.allDay ? siteTz : eventTimeZone(e, settings));
   return { date: `${p.y}-${pad(p.m)}-${pad(p.d)}`, time: `${pad(p.hh)}:${pad(p.mm)}` };
 };
-const roomName = new Map(resources.map((r) => [r.id, r.name]));
+// the rooms in the page's language (their main names without one)
+const roomName = new Map(resources.map((r) => [r.id, nameIn(r, lang)]));
 const requestable = resources.filter((r) => r.requestable).map((r) => r.id);
 /** the rooms a host may pick for a date: the event's own (and its dates'), and the requestable ones */
 const roomChoices = (e: CalEvent) => [...new Set([...eventRoomIds(e), ...requestable])].filter((id) => roomName.has(id)).map((id) => ({ id, name: roomName.get(id)! }));