@acms-subir/core 0.3.57 → 0.3.58

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @acms-subir/core
 
+## 0.3.58
+
+### Patch Changes
+
+- c26c7c1: Rooms can have a name in each of the site's other languages. Admin → Calendar → Rooms → a room shows **Name in Español** (one field per extra language) under its name, and the editor API takes `translations: { es: { name } }`. Each place that names a room uses the name in its language, and falls back to the main name:
+
+  - public event data: `rooms` in `/api/v1/events`, `/api/v1/events/:slug` and search, following `?locale=` (else the site's main language);
+  - calendar views and cards, including "Reserved" blocks, and section event items on Spanish pages;
+  - the `/request` form and `GET /api/v1/requests/options?locale=`;
+  - the TV display (its room columns and legend);
+  - the hosts' My events;
+  - request emails and the request status page, in the requester's language;
+  - booking emails, in the booker's language.
+
+  The slug stays the same in every language. Staff screens, staff emails and `GET /api/v1/rooms/free` keep the main name. `roomName(room, locale)` in `lib/schema.ts` picks the name, and `es-MX` uses the `es` name. Migration 71 adds `resources.translations` (`'{}'` for existing rooms); changing it refreshes cached pages and API answers. Backups and environment sync carry it.
+
 ## 0.3.57
 
 ### Patch Changes

package/cli/migrations.generated.mjs

@@ -1363,13 +1363,20 @@ var MIGRATIONS = [
   GCAL_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])
+  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]
+  ] }
 ];
 var 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
 };
 var LATEST_VERSION = MIGRATIONS[MIGRATIONS.length - 1].version;

package/docs/calendar.md

@@ -283,6 +283,20 @@ Each room also has:
   names the room. When it's off, only staff see that an event uses the room.
 - **Anyone can check if it’s free** (`requestable`, off by default): the room answers
   the public free/busy check below.
+- **Name in Español** (and each of the site's other languages; `translations: { es: {
+  name } }`): the room's name on pages, app answers, TV screens and emails in that
+  language. Without one, the main name shows. The slug stays the same in every
+  language. Site code reads it with `roomName(room, locale)` from the schema.
+
+Where a room's name follows the language:
+- public event data (`rooms`, with `?locale=` in the app API);
+- calendar views, cards and section items;
+- the request form and `GET /api/v1/requests/options`;
+- the TV display;
+- My events;
+- request emails and booking emails, in the person's language.
+
+The admin and staff emails use the main name.
 
 ### Rooms in event data
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.57",
+  "version": "0.3.58",
   "publishConfig": {
     "access": "public"
   },

package/src/lib/booking/service.ts

@@ -5,6 +5,7 @@ import { collectResponse, displayAnswers } from '../forms/service';
 // calendar immediately); the rest wait as "pending" for staff.
 import type { ContentRepository } from '../repo/types';
 import type { Booking, BookingLink, BookingStatus, CalEvent, Resource, Settings } from '../schema';
+import { roomName } from '../schema';
 import { loadFeed, expandVEvents } from '../calendar/ics';
 import { emitWebhook } from '../webhooks';
 import { parseFrom } from '../email/config';
@@ -108,8 +109,9 @@ async function describe(repo: ContentRepository, b: Booking, settings: Settings,
   const tz = resource ? resourceZone(resource, settings.timezone) : settings.timezone || 'UTC';
   return {
     resource, link, event: null as CalEvent | null, tz,
-    title: [resource?.name, link?.name].filter(Boolean).join(' · ') || 'Booking',
-    location: resource?.name ?? '',
+    // the room in the booking's language (its main name without one)
+    title: [resource && roomName(resource, locale), link?.name].filter(Boolean).join(' · ') || 'Booking',
+    location: resource ? roomName(resource, locale) : '',
     when: whenText(b, tz, settings, link?.mode === 'day'),
   };
 }

package/src/lib/calendar/api.ts

@@ -3,7 +3,7 @@
 // everywhere. Drafts, internal ids of private calendars, staging data and
 // private custom fields (unless a staff caller asks for them) never appear
 // here. Rooms are named only when set to show on public events (or for staff).
-import { roomColor, type CalEvent, type Calendar, type MovedDate, type Resource } from '../schema';
+import { roomColor, roomName, type CalEvent, type Calendar, type MovedDate, type Resource } from '../schema';
 import { calendarFeedUrl, eventIcsUrl, eventUrl, publicEventFields } from './config';
 import { describeRepeat } from './rrule';
 import { localizeForm } from '../forms/localize';
@@ -67,11 +67,11 @@ export function movedDatesToJson(e: Pick<CalEvent, 'movedDates'>, includePrivate
   return Object.fromEntries(Object.entries(e.movedDates ?? {}).map(([k, m]) => [k, includePrivate ? m : { start: m.start, end: m.end, note: m.note }]));
 }
 
-/** Rooms as public data: only those set to show on public events, unless `includePrivate` (staff). Unknown ids are skipped. */
-export function roomsToJson(ids: string[], resources: Map<string, Resource> | undefined, includePrivate = false): RoomJson[] {
+/** Rooms as public data: only those set to show on public events, unless `includePrivate` (staff); named in `locale` when they have a name in it. Unknown ids are skipped. */
+export function roomsToJson(ids: string[], resources: Map<string, Resource> | undefined, includePrivate = false, locale?: string | null): RoomJson[] {
   if (!resources) return [];
   return ids.map((id) => resources.get(id)).filter((r): r is Resource => Boolean(r) && (includePrivate || r!.showOnEvents))
-    .map((r) => ({ slug: r.slug, name: r.name, color: roomColor(r) || null }));
+    .map((r) => ({ slug: r.slug, name: roomName(r, locale), color: roomColor(r) || null }));
 }
 
 const abs = (origin: string, path: string) => (/^https?:\/\//.test(path) ? path : origin + path);
@@ -84,7 +84,7 @@ const untilDate = (locale: string) => (ymd: string) => {
 };
 
 // resources: every room by id (rooms stay [] without it); locale: the
-// language of the repeat line ("Cada semana el sábado"; English without it)
+// language of the repeat line and the room names ("Cada semana el sábado"; English without it)
 export function eventToJson(e: CalEvent, origin: string, calendars: Map<string, Calendar>, siteTz = '', opts: { includePrivate?: boolean; resources?: Map<string, Resource>; locale?: string } = {}): EventJson {
   return {
     id: e.id,
@@ -106,7 +106,7 @@ export function eventToJson(e: CalEvent, origin: string, calendars: Map<string,
     segments: seriesParts(e).slice(1).map((p) => ({
       from: p.from, start: p.start, end: p.end, rrule: p.rrule, repeats: describeRepeat(p.rrule, p.start, opts.locale ? untilDate(opts.locale) : undefined, opts.locale), cancelled: p.cancelled, note: p.note,
       location: p.location ? { name: p.location.name, address: p.location.address, url: p.location.url } : null,
-      rooms: roomsToJson(p.roomIds, opts.resources, opts.includePrivate),
+      rooms: roomsToJson(p.roomIds, opts.resources, opts.includePrivate, opts.locale),
     })),    exdates: e.exdates,
     cancelledDates: e.cancelledDates ?? [],
     movedDates: movedDatesToJson(e, opts.includePrivate),
@@ -121,7 +121,7 @@ export function eventToJson(e: CalEvent, origin: string, calendars: Map<string,
       .map((id) => calendars.get(id))
       .filter((c): c is Calendar => Boolean(c) && c!.visibility !== 'private')
       .map((c) => ({ id: c.id, slug: c.slug, name: c.name, color: c.color })),
-    rooms: roomsToJson(e.roomHold.resourceIds, opts.resources, opts.includePrivate),
+    rooms: roomsToJson(e.roomHold.resourceIds, opts.resources, opts.includePrivate, opts.locale),
     fields: opts.includePrivate ? e.fields : publicEventFields(e.fields),
     updatedAt: new Date(e.updatedAt).toISOString(),
   };

package/src/lib/calendar/data.ts

@@ -7,7 +7,7 @@
 // details, lib/display: published events only, private calendars when it
 // names them, bookings with the booker's name, never emails, phones or notes).
 import type { ContentRepository } from '../repo/types';
-import { roomColor, type BookingLink, type CalEvent, type Calendar, type EventLocation, type Resource, type Settings } from '../schema';
+import { roomColor, roomName, type BookingLink, type CalEvent, type Calendar, type EventLocation, type Resource, type Settings } from '../schema';
 import { eventIsListed, eventIsPublic, eventRoomIds, expandEvents, locationLine, safeColor, type OccurrenceMove } from './events';
 import { expandVEvents, loadFeed, tzParts, type CalendarEvent, type CalendarWindow } from './ics';
 import { CALENDAR, eventUrl, resourceUrl, withoutPrivateFields } from './config';
@@ -107,7 +107,7 @@ export async function collectViewEvents(
   const rooms = (ids: string[]) => ids.map((id) => resources.get(id))
     // staff views and screens with private details name every room
     .filter((r): r is Resource => Boolean(r) && (scope.audience !== 'public' || r!.showOnEvents))
-    .map((r) => ({ id: r.id, slug: r.slug, name: r.name, color: roomColor(r) }));
+    .map((r) => ({ id: r.id, slug: r.slug, name: roomName(r, scope.locale), color: roomColor(r) }));
   const words = eventStrings(scope.locale).calendar;
   for (const o of expandEvents(natives, settings, win)) {
     // rooms are per date (a moved date can change them)
@@ -176,14 +176,16 @@ export async function collectViewEvents(
         const r = byId.get(b.resourceId);
         if (!r) continue;
         const allDay = b.end - b.start >= 86_400_000 - 3_600_000;
+        // the room in the view's language (its main name without one)
+        const room = roomName(r, scope.locale);
         const title = scope.audience === 'admin' ? `${r.name} · ${b.name}`
-          : scope.audience === 'screen' ? [linkName.get(b.linkId) || r.name, b.name].filter(Boolean).join(' · ')
-          : `${words.reserved} · ${r.name}`;
+          : scope.audience === 'screen' ? [linkName.get(b.linkId) || room, b.name].filter(Boolean).join(' · ')
+          : `${words.reserved} · ${room}`;
         events.push({
           start: b.start, end: b.end, allDay, days: allDay ? Math.max(1, Math.round((b.end - b.start) / 86_400_000)) : 1,
-          title, location: r.name, description: '', cal: inScope.length, color: '#8e919a', calendarName: r.name,
+          title, location: room, description: '', cal: inScope.length, color: '#8e919a', calendarName: room,
           url: scope.audience === 'public' ? resourceUrl(r.slug) : undefined,
-          rooms: [{ id: r.id, slug: r.slug, name: r.name, color: roomColor(r) }],
+          rooms: [{ id: r.id, slug: r.slug, name: room, color: roomColor(r) }],
         });
       }
     }

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)! }));