@acms-subir/core 0.3.52 → 0.3.54

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @acms-subir/core
 
+## 0.3.54
+
+### Patch Changes
+
+- 031e463: Hosts move single dates of their events from My events, and My events speaks the visitor's language.
+
+  - **Move… on each date.** Each upcoming date of a repeating event a host runs now has **Move…**, next to Cancel and Restore. It takes the date, the start and end, the date's rooms and a note for people who come. Hosts pick from the event's own rooms and the ones marked **Anyone can check if it’s free**. A date the host moved also gets **Move back**. People who signed up are emailed the new time, as with staff moves.
+  - **`acms({ members: { hostMoves } })`.** With `'direct'` (the default), a move applies at once while the rooms are free, and staff get the "Date moved" email. If a room is taken, the host sees which one and can **Send as a request** instead. With `'approve'`, every host move is a request.
+  - **Requests.** Host requests wait in Schedule → List → **Requests** under "Date changes from hosts", with what else holds the room at the new time. **Approve** makes the move (a clash only warns) and records it as the host's. **Decline…** keeps the date and sends the host your note. Staff get a "Date move to review" email, and the host hears the answer. The requests are stored on their own rows, in a new `event_requests` table (migration 68). Requests from people without an account will share that table.
+  - **Server API.** `@acms-subir/core/server` adds `moveHostedDate`, `moveHostedDateBack`, `requestDateMove`, `listMyDateRequests`, `withdrawDateRequest`, `approveDateRequest` and `declineDateRequest`. Member errors now carry a `code`.
+  - **My events under `/es`.** The pages, buttons, notices, the request form and their errors follow the address, so `/es/members/events` is in Spanish, including the event's translated title and the dates. The words exist in English, Spanish, French, German and Portuguese.
+
+## 0.3.53
+
+### Patch Changes
+
+- 1b8201d: Forms get a **Time** question and can speak every language your site has.
+
+  **Time questions.** Add one from the builder's question menu (next to Date). Visitors pick a time with their browser's time picker; it's saved as a 24-hour time like `18:30` and shows that way in Responses, CSV exports and alert emails. Required works like any other question, and anything that isn't a real time is refused. Event registration forms can ask it too.
+
+  **Forms in your site's other languages.** On a site with more than one language, the form builder now has a language switcher (English · Español …) above the canvas, and so does an event's registration form. Pick a language to write its words: the title, introduction, button and thank-you message, and each question's label, help text, placeholder and choices. You type straight onto the form, with the main language showing in grey where you haven't written anything yet, and the side panel shows the main language's words above each box. Anything left blank shows the main language. The questions themselves (types, order, choices, Required and the other settings) stay the same in every language, and when you add, remove or reorder choices, their translations move with them. Translation changes to a published form go live with **Publish changes**, and the menu opens the live form in each language.
+
+  - `/es/forms/<id>` shows the form in Spanish, and a Form block on a Spanish page, post, event or home page opens it in Spanish. Event pages in another language show the registration questions in that language too.
+  - The form's own words around your questions ("Submit", "Choose…", "Other", "Send another response" and the default thank-you) follow the page's language in English, Spanish, French, German and Portuguese. Error messages are still in English.
+  - Answers are always saved with the main-language choice, so Responses, exports and alerts read the same whatever language someone answered in. A translated choice can't read the same as a different choice, so every answer maps back to exactly one.
+  - Rewording a translated label, help text or title doesn't change a form's version, so someone halfway through the form, on the website or in an app, can still send it. Rewording a translated choice does, so an answer in the old words is sent back for a reload instead of being stored as the wrong choice. Sending the same website response again (a refresh after sending) shows the thank-you again and stores it once.
+
+  **API:** `GET /api/v1/forms/{id}` takes an optional `locale` and returns the form's words in that language (the main language's where it has none); `version` is the same in every language. `POST /api/v1/forms/{id}/responses` accepts a choice in the language it was shown in or in the main one, and an optional `?locale=` for the receipt's thank-you. `GET /api/v1/events/{slug}/rsvp?locale=` returns the registration questions in that language, and RSVPs may send their choices the same way. Field `type` can now be `time` (24-hour `HH:mm`). Stored forms gain optional `translations` on the form and on each question; nothing changes for forms without them, and no migration is needed.
+
 ## 0.3.52
 
 ### Patch Changes

package/cli/migrations.generated.mjs

@@ -447,6 +447,20 @@ var SCREENS_MIGRATION = {
   ]
 };
 
+// src/lib/calendar/request-migration.ts
+var REQUEST_TABLE = [
+  `CREATE TABLE event_requests (
+    id TEXT PRIMARY KEY, kind TEXT NOT NULL, state TEXT NOT NULL, source TEXT NOT NULL,
+    user_id TEXT NOT NULL DEFAULT '', requester TEXT,
+    event_id TEXT NOT NULL DEFAULT '', occurrence_key TEXT NOT NULL DEFAULT '',
+    data TEXT NOT NULL DEFAULT '{}', note TEXT NOT NULL DEFAULT '', reply TEXT NOT NULL DEFAULT '',
+    reviewed_by TEXT NOT NULL DEFAULT '', reviewed_at INTEGER NOT NULL DEFAULT 0,
+    created_at INTEGER NOT NULL, updated_at INTEGER NOT NULL
+  )`,
+  `CREATE INDEX event_requests_state ON event_requests (state, created_at)`,
+  `CREATE INDEX event_requests_event ON event_requests (event_id)`
+];
+
 // src/lib/repo/migrations.ts
 var CONTENT_VERSION_COLUMNS = {
   settings: [
@@ -1281,7 +1295,10 @@ var MIGRATIONS = [
   // row, so the triggers on events (content version, event_changes) see a move
   MOVED_DATES_MIGRATION(contentVersionTriggers("events", [...CONTENT_VERSION_COLUMNS.events, "cancelled_dates", "moved_dates"])[2]),
   // saved TV screens (Admin → Calendar → Screens, lib/display/store.ts)
-  SCREENS_MIGRATION
+  SCREENS_MIGRATION,
+  // calendar requests on their own rows (RequestRecord): new events and
+  // changes asked for without an account, and hosts' date moves
+  { version: 68, statements: REQUEST_TABLE }
 ];
 var CURRENT_CONTENT_VERSION_COLUMNS = {
   ...CONTENT_VERSION_COLUMNS,

package/docs/calendar.md

@@ -99,8 +99,9 @@ and `moveOccurrenceBack(repo, who, eventId, key, ctx, { quiet? })` check who is
 - **`GOOGLE_SYNC`** is a calendar sync acting with staff rights. A clash only warns,
   since the change already happened in Google.
 - **A host of the event** may move its dates while the rooms are free; a taken room
-  refuses the move (409). Staff (`members.notify`, else the owners) are emailed about
-  each move a host makes.
+  refuses the move (409). They pick rooms among the event's own and the rooms marked
+  **Anyone can check if it’s free** (403 `room-not-allowed` otherwise). Staff
+  (`members.notify`, else the owners) are emailed about each move a host makes.
 - Anyone else gets 404, and nobody signed in gets 401.
 
 `end` defaults to the date's own length. `roomIds`, `location` and `note` replace the
@@ -114,6 +115,22 @@ write, webhook, push or email. A sync can retry, or re-apply what it already app
 safely. Cancelling a date that's already cancelled, or restoring one that isn't, is a
 no-op too, even after the date has passed.
 
+### Hosts on My events
+
+Hosts move dates from **My events** (`/members/events`): each upcoming date has
+**Move…** next to **Cancel**, and a date they moved has **Move back**.
+`acms({ members: { hostMoves } })` decides how a host's move applies:
+
+- `'direct'` (the default): at once while the date's rooms are free, as above. When a
+  room is taken the host sees which one and can **Send as a request** instead.
+- `'approve'`: every host move, and every move back, is a request.
+
+Requests wait in Schedule → List → **Requests** under "Date changes from hosts", with
+what else holds the rooms at the new time. **Approve** makes the move as you (a clash
+only warns) and records it as the host's. **Decline…** keeps the date and sends the host
+your note. Both answers email the host. The server API is `moveHostedDate`,
+`requestDateMove` and `approveDateRequest` in `npx acms docs server`.
+
 Errors carry a `status`, a message safe to show people, and a `code`:
 
 | status | code | when |
@@ -127,6 +144,7 @@ Errors carry a `status`, a message safe to show people, and a `code`:
 | 409 | `cancelled-event` | the whole event is cancelled |
 | 409 | `cancelled-date` | the date is cancelled (restore it first) |
 | 409 | `room-taken` | a host moving into a taken room |
+| 403 | `room-not-allowed` | a host picking a room the event doesn't use and nobody may request |
 | 401, 404 | | who is acting |
 
 ## Rooms

package/docs/mobile.md

@@ -124,7 +124,7 @@ Read the app's `AGENTS.md` too: it holds the same rules, next to the code.
 | `useManagedBooking(token)` / `useCancelBooking` / `useRescheduleBooking` / `useRescheduleAvailability` | the booker's own booking (from `book()`'s `manageToken`): `can.cancel`, `can.reschedule`, `can.closed` (change cutoff passed: show "Contact us") |
 | `useConfirmBooking(token)` | an RSVP on a waitlist: `waitlisted` shows "#3 in line · 2 seats" (`waitlistLineText(booking, words, locale)`) and can leave (`useCancelBooking`); `offered` holds a spot until `booking.holdUntil` (`holdText`: "We're holding it until Fri, Oct 24 at 9 PM") and `can.confirm` takes it. `isReleased(error)`: the hold ran out (410) and the spot went to the next person |
 | `useGuest()` / `useMyBookings({ when })` | guest sign-in with an emailed code, then every booking made with that email; check `features.guestSignIn` |
-| `useLinks()` / `useForm(id)` / `useSubmitForm(id)` | the links page; published forms and sending answers; check `features.links` / `features.forms` |
+| `useLinks()` / `useForm(id)` / `useSubmitForm(id)` | the links page; published forms (in the app's language where the form has its words) and sending answers (choices as shown; `time` answers are 24-hour `HH:mm`, and `answerProblems` checks them); check `features.links` / `features.forms`. Ask a question type you don't know as short text |
 | `useLive()` | live video: `snapshot`, `status` (`live`/`upcoming`/`offline`), `isLive`, localized `view` text, the owner's `display` choices (`style`, `bar`, `header`, `dock`). Polls every 30 s only in the foreground, rechecks on resume, drops an expired "live" even offline; idle while `features.live` is false. Render `<LiveCard>` / `<LiveTag>` |
 | `useResources()` / `useAvailability({ resource, link })` / `useBooking()` | bookings |
 | `useRoomFree({ room, start, end })` | bookings: is a requestable room free (no names) |

package/docs/server.md

@@ -16,6 +16,8 @@ import {
   eventRoomClashes, roomBusy,
   listMyEvents, listEventRequests, submitEventRequest, updateEventRequest,
   withdrawEventRequest, approveEventRequest, declineEventRequest, setHostedOccurrence,
+  moveHostedDate, moveHostedDateBack, requestDateMove, listMyDateRequests, withdrawDateRequest,
+  approveDateRequest, declineDateRequest,
 } from '@acms-subir/core/server';
 ```
 
@@ -49,11 +51,23 @@ approveEventRequest(repo: Repo, who: ServerUser | null, eventId: string, ctx: Wr
 declineEventRequest(repo: Repo, who: ServerUser | null, eventId: string, reply: string, ctx: WriteContext, seen?: number): Promise<CalEvent>
 setHostedOccurrence(repo: Repo, who: ServerUser | null, eventId: string, occurrenceKey: string, cancelled: boolean, ctx: WriteContext): Promise<CalEvent>
 
+// hosts moving dates (acms({ members: { hostMoves } }))
+moveHostedDate(repo: Repo, who: ServerUser | null, eventId: string, occurrenceKey: string, input: MoveInput, ctx: WriteContext): Promise<HostMoveResult>
+moveHostedDateBack(repo: Repo, who: ServerUser | null, eventId: string, occurrenceKey: string, ctx: WriteContext): Promise<HostMoveResult>
+requestDateMove(repo: Repo, who: ServerUser | null, eventId: string, occurrenceKey: string, input: MoveInput | null, message: string, ctx: WriteContext): Promise<RequestRecord>
+listMyDateRequests(repo: Repo, who: ServerUser | null, eventId?: string): Promise<RequestRecord[]>
+withdrawDateRequest(repo: Repo, who: ServerUser | null, requestId: string): Promise<void>
+approveDateRequest(repo: Repo, who: ServerUser | null, requestId: string, ctx: WriteContext, seen?: number): Promise<{ request: RequestRecord; moved: MoveResult }>
+declineDateRequest(repo: Repo, who: ServerUser | null, requestId: string, reply: string, ctx: WriteContext, seen?: number): Promise<RequestRecord>
+
 type Role = 'owner' | 'administrator' | 'editor' | 'author' | 'contributor' | (string & {})
 interface ServerUser { id: string; email: string; name: string; role: Role; staff: boolean; can(permission: string): boolean }
 interface Occurrence { event: CalEvent; start: number; end: number; allDay: boolean; days: number; key: string; cancelled: boolean; roomIds: string[]; moved?: { from: { start: number; end: number }; note: string; location?: EventLocation } }
 interface MoveInput { start: string; end?: string; roomIds?: string[]; location?: Partial<EventLocation> | null; note?: string }
 interface MoveResult { event: CalEvent; clashes: BusySlot[]; changed: boolean }
+type HostMoveResult = { moved: MoveResult } | { request: RequestRecord }
+interface RequestRecord { id: string; kind: 'new' | 'change' | 'move' | 'from-date'; state: 'pending' | 'approved' | 'declined' | 'withdrawn'; source: 'member' | 'web' | 'app'; userId: string; requester: { name: string; email: string; phone: string; locale: string } | null; eventId: string; key: string; data: Record<string, unknown>; note: string; reply: string; reviewedBy: string; reviewedAt: number; createdAt: number; updatedAt: number }
+interface MoveRequestData { start: string; end: string; roomIds?: string[]; note: string; back?: boolean }
 interface Hold { resourceId: string; eventId: string; key: string; title: string; start: number; end: number; eventStart: number; eventEnd: number }
 interface EventClash { hold: Hold; other: Hold }
 interface BusySlot { resourceId: string; start: number; end: number; kind: 'event' | 'booking' | 'block' | 'calendar'; title: string; eventId?: string; key?: string; bookingId?: string }
@@ -145,6 +159,9 @@ error.
   emailed. `opts.quiet` skips the app notice and that staff email.
 - **`moveOccurrenceBack(...)`**: puts it back where the series has it. Idempotent.
 
+A host picks rooms only among the ones the event already uses and the rooms marked
+**Anyone can check if it’s free** (403, code `room-not-allowed`, otherwise).
+
 Moving a date to where it already is returns `changed: false` without writing or
 sending anything, so retries are safe. Errors carry `status` and `code` (`one-off`,
 `not-a-date`, `started`, `past`, `bad-time`, `cancelled-date`, `room-taken`…; the
@@ -300,6 +317,42 @@ The functions take the person acting (`currentUser(ctx)`) and check them on ever
   (`true`) or restores (`false`) one date of an event they host, at once. No permission
   needed beyond being in `hostIds`. Same rules and errors as `cancelOccurrence`.
 
+### Hosts moving dates
+
+A host moves one date of an event they host from My events, or from your own page with
+these. Being in `hostIds` is enough; no permission is needed. Staff who host an event
+always move at once.
+
+- **`moveHostedDate(repo, who, eventId, key, input, ctx)`**: with
+  `acms({ members: { hostMoves: 'direct' } })` (the default) the move applies at once
+  while the date's rooms are free: `{ moved }`, and staff get the "Date moved" email. A
+  taken room answers 409 with code `room-taken`, and the same move can then go to staff
+  with `requestDateMove`. With `hostMoves: 'approve'` every host move becomes a request:
+  `{ request }`.
+- **`moveHostedDateBack(repo, who, eventId, key, ctx)`**: puts a moved date back, at once
+  or as a request, the same way.
+- **`requestDateMove(repo, who, eventId, key, input, message, ctx)`**: asks staff to move
+  the date (`input`), or to move it back (`null`). It's checked like the move itself, but
+  a taken room is allowed, since staff decide. `message` is for staff only. Asking again
+  about the same date replaces the waiting request. Staff (`members.notify`, else the
+  owners) get a "Date move to review" email.
+- **`listMyDateRequests(repo, who, eventId?)`**, **`withdrawDateRequest(repo, who, requestId)`**:
+  the host's own requests, newest first, and taking one back.
+- **`approveDateRequest(repo, who, requestId, ctx, seen?)`**: needs **Publish content**.
+  The move runs as the approver, so room clashes are warnings in `moved.clashes`. It is
+  recorded as the host's move (`movedDates[key].by`), so they can move it back later. The
+  host is emailed. Pass `seen`, the request's `updatedAt` you showed, to get 409 if the
+  host changed it since.
+- **`declineDateRequest(repo, who, requestId, reply, ctx, seen?)`**: the date stays as it
+  is, and the host is emailed `reply`.
+
+These requests are `RequestRecord`s with `kind: 'move'` and `data: MoveRequestData`,
+stored on their own rows (the same table as requests from people without an account).
+Approved, declined and withdrawn ones stay listed until they're deleted after the
+retention period. Errors carry a `code` as well as a `status`, so your page can word
+them in its own language. The built-in pages use the codes in
+`lib/calendar/member-words.ts` (English, Spanish, French, German and Portuguese).
+
 `EventRequestInput` is what a member may fill in. Staff can change anything else in the
 admin.
 
@@ -340,7 +393,14 @@ With the calendar on, `acms({ members })` adds "My events" in the site's theme:
 | `/members/events/new` | the request form |
 | `/members/events/[id]` | one of their events and its request |
 
-`/members` itself redirects to `/members/events`.
+`/members` itself redirects to `/members/events`. With more than one site language the
+pages follow the address, like the rest of the site: `/es/members/events` is My events in
+Spanish (words, dates and the event's translated title). Its buttons and errors exist in
+English, Spanish, French, German and Portuguese; other languages show English.
+
+Each upcoming date of a repeating event a host runs has **Cancel** (or **Restore**),
+**Move…** (date, times, rooms and a note for people who come) and, for a date they
+moved, **Move back**. A taken room shows the clash with **Send as a request**.
 
 `members: { base: '/club' }` moves them. A file at the same path in your `src/pages/`
 replaces that one page. `members: false` removes them all; the functions above keep

package/integration.mjs

@@ -428,10 +428,13 @@ const unknownKeys = (label, value, known) => {
 const isSitePath = (p) => typeof p === 'string' && p.startsWith('/') && !p.startsWith('//') && !/[\\\s\u0000-\u001f]/.test(p);
 const isAdminPath = (p) => /^\/(admin|api|_actions)(\/|$|\?|#)/.test(p);
 function resolveMembers(members, calendar) {
-  if (members === false) return { enabled: false, base: '/members', notify: [] };
+  if (members === false) return { enabled: false, base: '/members', notify: [], hostMoves: 'direct' };
   if (members === undefined || members === true) members = {};
   if (!members || typeof members !== 'object' || Array.isArray(members)) throw new Error('acms: members must be an object (or false to turn off the built-in member pages)');
-  unknownKeys('members', members, ['base', 'notify']);
+  unknownKeys('members', members, ['base', 'notify', 'hostMoves']);
+  // a host moving one date: at once while its rooms are free, or always as a request for staff
+  const hostMoves = members.hostMoves ?? 'direct';
+  if (hostMoves !== 'direct' && hostMoves !== 'approve') throw new Error(`acms: members.hostMoves must be 'direct' or 'approve' — got ${JSON.stringify(hostMoves)}`);
   // who hears about new event requests (default: the owners)
   const notify = members.notify ?? [];
   if (!Array.isArray(notify) || notify.length > 20 || notify.some((e) => typeof e !== 'string' || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(e))) {
@@ -443,7 +446,7 @@ function resolveMembers(members, calendar) {
   }
   if (RESERVED_BASES.has(base) || base === '/account') throw new Error(`acms: members.base "${base}" collides with a built-in route — pick another path`);
   // the built-in pages are "My events": they need the calendar
-  return { enabled: calendar.enabled, base, notify: notify.map((e) => e.trim().toLowerCase()) };
+  return { enabled: calendar.enabled, base, notify: notify.map((e) => e.trim().toLowerCase()), hostMoves };
 }
 function resolveAnnouncements(announcements, reserved) {
   if (announcements === undefined || announcements === false) return { enabled: false, base: '/announcements', pages: true, topics: {} };
@@ -689,13 +692,16 @@ function acmsVitePlugin(userConfig) {
  *   'Cancel any class', defaults: ['administrator'] }`. They show on Team →
  *   Roles under "This site" and answer `currentUser().can(key)`. Owners hold
  *   every permission; `defaults` lists the other roles that start with it.
- * @param {false | {base?: string, notify?: string[]}} [options.members]
+ * @param {false | {base?: string, notify?: string[], hostMoves?: 'direct' | 'approve'}} [options.members]
  *   Built-in "My events" pages for signed-in members (default base
  *   '/members', needs the calendar): the events they host, their event
  *   requests and a request form. `false` turns the pages off (the server API
  *   in @acms-subir/core/server still works, so a site can build its own); a
  *   site file at the same path replaces any one page. `notify` lists who is
- *   emailed about new event requests (default: the owners).
+ *   emailed about new event requests (default: the owners). `hostMoves`:
+ *   'direct' (default) lets a host move one date at once while its rooms are
+ *   free (a taken room can be sent as a request instead); 'approve' sends
+ *   every host move to staff as a request.
  * @param {boolean | {base?: string, pages?: boolean, topics?: {event?: string, registration?: string, help?: string, info?: string}}} [options.announcements]
  *   Announcements (off by default): Admin → Announcements stores messages for
  *   members (event, registration, help needed, good to know, urgent) in each

package/mobile-template/recipes/events/files/components/RsvpPanel.tsx

@@ -32,7 +32,7 @@ const tokens = {
 
 type Answers = Record<string, string | string[]>;
 const OTHER = '__other__';
-const keyboards: Partial<Record<FormField['type'], KeyboardTypeOptions>> = { email: 'email-address', phone: 'phone-pad', number: 'numeric', url: 'url' };
+const keyboards: Partial<Record<FormField['type'], KeyboardTypeOptions>> = { email: 'email-address', phone: 'phone-pad', number: 'numeric', url: 'url', time: 'numbers-and-punctuation' };
 // "Other" choices send the typed text instead
 const withOther = (f: FormField, value: string | string[] | undefined, other: string): string | string[] => {
   if (f.type === 'checkboxes') { const list = Array.isArray(value) ? value : []; return list.includes(OTHER) ? [...list.filter((v) => v !== OTHER), other.trim()] : list; }
@@ -269,7 +269,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
     }
     return text(f.label, String(values[f.id] ?? ''), (v) => set(f.id, v), {
       required: f.required, help: f.help, problem, multiline: f.type === 'textarea', keyboard: keyboards[f.type],
-      placeholder: f.placeholder || (f.type === 'date' ? words.datePlaceholder : undefined), auto: f.type === 'email' ? 'email' : f.type === 'phone' ? 'tel' : undefined,
+      placeholder: f.placeholder || (f.type === 'date' ? words.datePlaceholder : f.type === 'time' ? words.timePlaceholder : undefined), auto: f.type === 'email' ? 'email' : f.type === 'phone' ? 'tel' : undefined,
     });
   };
 

package/mobile-template/recipes/rsvp/files/components/RsvpPanel.tsx

@@ -32,7 +32,7 @@ const tokens = {
 
 type Answers = Record<string, string | string[]>;
 const OTHER = '__other__';
-const keyboards: Partial<Record<FormField['type'], KeyboardTypeOptions>> = { email: 'email-address', phone: 'phone-pad', number: 'numeric', url: 'url' };
+const keyboards: Partial<Record<FormField['type'], KeyboardTypeOptions>> = { email: 'email-address', phone: 'phone-pad', number: 'numeric', url: 'url', time: 'numbers-and-punctuation' };
 // "Other" choices send the typed text instead
 const withOther = (f: FormField, value: string | string[] | undefined, other: string): string | string[] => {
   if (f.type === 'checkboxes') { const list = Array.isArray(value) ? value : []; return list.includes(OTHER) ? [...list.filter((v) => v !== OTHER), other.trim()] : list; }
@@ -269,7 +269,7 @@ export function RsvpPanel({ slug, start, children }: { slug: string; start: stri
     }
     return text(f.label, String(values[f.id] ?? ''), (v) => set(f.id, v), {
       required: f.required, help: f.help, problem, multiline: f.type === 'textarea', keyboard: keyboards[f.type],
-      placeholder: f.placeholder || (f.type === 'date' ? words.datePlaceholder : undefined), auto: f.type === 'email' ? 'email' : f.type === 'phone' ? 'tel' : undefined,
+      placeholder: f.placeholder || (f.type === 'date' ? words.datePlaceholder : f.type === 'time' ? words.timePlaceholder : undefined), auto: f.type === 'email' ? 'email' : f.type === 'phone' ? 'tel' : undefined,
     });
   };
 

package/package.json

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

package/src/components/ThemeSections.astro

@@ -19,11 +19,11 @@ const { page, settings } = Astro.props;
 const theme = getTheme(settings.activeTheme);
 const layout = settings.sectionPages[page.id];
 const repo = await getRepo(Astro.locals);
-const bodyHtml = page.bodyHtml ? highlightCodeHtml(await expandDynamicBlocks(page.bodyHtml, repo)) : '';
+const locale = Astro.props.locale ?? requestLocale(Astro.url, Astro.locals);
+const bodyHtml = page.bodyHtml ? highlightCodeHtml(await expandDynamicBlocks(page.bodyHtml, repo, locale)) : '';
 // admin design preview: sections carry their ids so the Design screen can
 // open the one you click (see Site.astro's preview script)
 const editable = Astro.props.editable ?? (await resolvePreview(Astro.url, Astro.cookies, Astro.locals)).role === 'admin';
-const locale = Astro.props.locale ?? requestLocale(Astro.url, Astro.locals);
 const now = Date.now();
 const nowWall = wallNow(settings.timezone || 'UTC', now);
 // another language: dates/times format in it (components read settings.locale)

package/src/components/editor/PostEditor.tsx

@@ -1162,6 +1162,8 @@ export default function PostEditor({ kind = 'post', post, page, event, calendars
                 eventId={docId}
                 title={meta.title}
                 status={meta.status}
+                languages={languages}
+                mainLanguage={mainLanguage}
                 tags={<TagInput tags={meta.tags} suggestions={tagSuggestions} onChange={(tags) => setMeta({ tags })} />}
               />
             </div>

package/src/components/editor/event/EventSheet.tsx

@@ -13,6 +13,7 @@ import { RegistrationCard } from './RegistrationCard';
 import { WhenCard } from './WhenCard';
 import { SingleDates } from './SingleDates';
 import { registrationMode } from './registration';
+import type { SiteLanguage } from '../../forms/FormBuilder';
 
 // Every event setting, on the page above the event's own content, as one
 // settings column: When · Where · CTA · Organize · Status, with a
@@ -31,6 +32,9 @@ interface Props {
   title: string;
   status: string;
   tags?: ReactNode;
+  /** the site's other languages and its main one, for the registration form's words in each */
+  languages?: SiteLanguage[];
+  mainLanguage?: SiteLanguage;
 }
 
 const SECTIONS = [
@@ -43,7 +47,7 @@ const SECTIONS = [
 
 const jump = (id: string) => document.getElementById(id)?.scrollIntoView({ behavior: 'smooth', block: 'start' });
 
-export function EventSheet({ meta, onChange, calendars, fields, siteTimezone, maps, eventId, title, status, tags }: Props) {
+export function EventSheet({ meta, onChange, calendars, fields, siteTimezone, maps, eventId, title, status, tags, languages, mainLanguage }: Props) {
   const [places, setPlaces] = useState<Place[]>([]);
   const [current, setCurrent] = useState<string>(SECTIONS[0].id);
   const root = useRef<HTMLDivElement>(null);
@@ -129,7 +133,7 @@ export function EventSheet({ meta, onChange, calendars, fields, siteTimezone, ma
             onLocation={(name) => onChange({ location: { ...meta.location, name, placeId: '' } })}
           />
         </Section>
-        <RegistrationCard meta={meta} onChange={onChange} eventId={eventId} title={title} />
+        <RegistrationCard meta={meta} onChange={onChange} eventId={eventId} title={title} languages={languages} mainLanguage={mainLanguage} />
         <OrganizeCard meta={meta} onChange={onChange} calendars={calendars} fields={fields} tags={tags} />
         <StatusSection meta={meta} onChange={onChange} />
       </div>

package/src/components/editor/event/RegistrationCard.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { starter } from '../../forms/FormBuilder';
+import { starter, type SiteLanguage } from '../../forms/FormBuilder';
 import type { EventCta } from '../../../lib/schema';
 import type { EventMeta } from '../EventPanel';
 import { Section } from './Section';
@@ -13,7 +13,7 @@ const MODES: { id: RegistrationMode; label: string; sub: string }[] = [
   { id: 'rsvp', label: 'Built-in form', sub: 'Collect RSVPs here' },
 ];
 
-export function RegistrationCard({ meta, onChange, eventId, title = '' }: { eventId?: string; title?: string; meta: EventMeta; onChange: (patch: Partial<EventMeta>) => void }) {
+export function RegistrationCard({ meta, onChange, eventId, title = '', languages, mainLanguage }: { eventId?: string; title?: string; meta: EventMeta; onChange: (patch: Partial<EventMeta>) => void; languages?: SiteLanguage[]; mainLanguage?: SiteLanguage }) {
   // "Link button" with nothing typed yet is still link mode, so keep the
   // choice locally and only fall back to the derived one on first render
   const [mode, setMode] = useState<RegistrationMode>(() => registrationMode(meta));
@@ -94,7 +94,7 @@ export function RegistrationCard({ meta, onChange, eventId, title = '' }: { even
               <button type="button" className="pe-btn sm" aria-haspopup="dialog" onClick={() => setEditing(true)}>Edit form</button>
             </div>
           </div>
-          {editing && <RegistrationFormEditor form={form} maxSeats={meta.rsvp.maxSeats} eventTitle={title} onClose={() => setEditing(false)} onChange={(f) => onChange({ rsvp: { ...meta.rsvp, form: f } })} />}
+          {editing && <RegistrationFormEditor form={form} maxSeats={meta.rsvp.maxSeats} eventTitle={title} languages={languages} mainLanguage={mainLanguage} onClose={() => setEditing(false)} onChange={(f) => onChange({ rsvp: { ...meta.rsvp, form: f } })} />}
         </div>
       )}
     </Section>

package/src/components/editor/event/RegistrationFormEditor.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import { actions } from 'astro:actions';
-import FormBuilder, { starter } from '../../forms/FormBuilder';
+import FormBuilder, { starter, type SiteLanguage } from '../../forms/FormBuilder';
 import type { SystemField } from '../../forms/meta';
 import type { FormDefinition, SavedForm } from '../../../lib/forms/schema';
 import '../../../styles/forms.css';
@@ -10,12 +10,15 @@ type Choice = { id: string; name: string; note: string; definition: () => FormDe
 // The event's own registration questions in the full forms builder, on top
 // of the event editor. Edits go straight into the event's meta (its own copy);
 // the event's Update/autosave persists them, so "Done" only closes.
-export function RegistrationFormEditor({ form, onChange, onClose, maxSeats, eventTitle }: {
+export function RegistrationFormEditor({ form, onChange, onClose, maxSeats, eventTitle, languages, mainLanguage }: {
   form: FormDefinition;
   onChange: (form: FormDefinition) => void;
   onClose: () => void;
   maxSeats: number;
   eventTitle: string;
+  /** the site's other languages: the builder's switcher writes the questions' words in each */
+  languages?: SiteLanguage[];
+  mainLanguage?: SiteLanguage;
 }) {
   const ref = useRef<HTMLDialogElement>(null);
   const [templates, setTemplates] = useState<SavedForm[]>([]);
@@ -135,7 +138,7 @@ export function RegistrationFormEditor({ form, onChange, onClose, maxSeats, even
         </div>
       )}
       <div className="pe-evr-body">
-        <FormBuilder value={form} onChange={onChange} mode="event" systemFields={system} />
+        <FormBuilder value={form} onChange={onChange} mode="event" systemFields={system} languages={languages} mainLanguage={mainLanguage} />
       </div>
     </dialog>
   );

package/src/components/forms/Canvas.tsx

@@ -2,6 +2,8 @@ import { Fragment, useId, useLayoutEffect, useRef, useState } from 'react';
 import { escapeForm, renderControl, renderField, renderFields } from '../../lib/forms/fields';
 import { isHalf, type FormDefinition, type FormField } from '../../lib/forms/schema';
 import { answersFrom, firstError } from '../../lib/forms/validate';
+import { formStrings, thanksText, type FormStrings } from '../../lib/forms/words';
+import { rsvpStrings } from '../../lib/calendar/rsvp-words';
 import { META, type Selection, type SystemField } from './meta';
 
 /** Plain-text contentEditable that doesn't fight the caret: the DOM is only rewritten when the value changes from outside. */
@@ -37,20 +39,22 @@ type CanvasProps = {
   onSelect: (s: Selection) => void; patch: (next: Partial<FormDefinition>, key: string) => void;
   patchField: (id: string, next: Partial<FormField>, key: string) => void; onLabelDone: (id: string) => void;
   onInsertAfter: (id: string | null) => void; onDuplicate: (id: string) => void; onRemove: (id: string) => void;
+  /** writing another language: `value` holds its words ('' = not written yet), `source` the main form, whose words show where it has none */
+  source?: FormDefinition; words?: FormStrings; submitFallback?: string;
 };
 
 /** The form drawn with the public form markup/classes; labels, help, title, intro and the button edit in place. */
 export function Canvas(p: CanvasProps) {
-  const { value, system, selection, event, onSelect } = p;
+  const { value, system, selection, event, onSelect, source } = p;
   const prefix = useId().replace(/:/g, '');
   const sel = (s: Selection) => JSON.stringify(s) === JSON.stringify(selection);
-  const submitFallback = event ? 'Confirm my seat' : 'Submit';
+  const submitFallback = p.submitFallback ?? (event ? 'Confirm my seat' : 'Submit');
 
   if (selection?.kind === 'thanks') return (
     <div className="fb-paper fb-paper-done">
       <p className="fb-paper-tag">After someone submits</p>
-      <h2 className="fb-title">{value.title || 'Thank you'}</h2>
-      <p className={`fb-thanks on`}><Inline value={value.confirmation} onChange={v => p.patch({ confirmation: v }, 'confirmation')} placeholder={event ? 'Uses the booking confirmation message' : 'Thank you. Your response has been received.'} max={1000} multiline label="Thank-you message" /></p>
+      <h2 className="fb-title">{value.title || source?.title || 'Thank you'}</h2>
+      <p className={`fb-thanks on`}><Inline value={value.confirmation} onChange={v => p.patch({ confirmation: v }, 'confirmation')} placeholder={event ? source?.confirmation || 'Uses the booking confirmation message' : thanksText(source?.confirmation ?? '', p.words ?? formStrings('en'))} max={1000} multiline label="Thank-you message" /></p>
       <button type="button" className="fb-link" onClick={() => onSelect(null)}>← Back to the questions</button>
     </div>
   );
@@ -66,8 +70,8 @@ export function Canvas(p: CanvasProps) {
   return (
     <div className="fb-paper" onClick={e => { if (e.target === e.currentTarget) onSelect(null); }}>
       <div className={`fb-item fb-head${sel({ kind: 'form' }) ? ' on' : ''}`} onClick={() => onSelect({ kind: 'form' })}>
-        <h2 className="fb-title"><Inline value={value.title} onChange={v => p.patch({ title: v }, 'title')} placeholder="Form title" max={120} label="Form title" /></h2>
-        <p className="fb-intro"><Inline value={value.intro} onChange={v => p.patch({ intro: v }, 'intro')} placeholder="Add an introduction (optional)" max={1000} multiline label="Introduction" /></p>
+        <h2 className="fb-title"><Inline value={value.title} onChange={v => p.patch({ title: v }, 'title')} placeholder={source?.title || 'Form title'} max={120} label="Form title" /></h2>
+        <p className="fb-intro"><Inline value={value.intro} onChange={v => p.patch({ intro: v }, 'intro')} placeholder={source?.intro || 'Add an introduction (optional)'} max={1000} multiline label="Introduction" /></p>
       </div>
       {system.map((f, i) => (
         <div key={`sys-${i}`} className={`fb-item fb-sys${sel({ kind: 'system', index: i }) ? ' on' : ''}`} onClick={() => onSelect({ kind: 'system', index: i })} title="Always asked">
@@ -81,27 +85,30 @@ export function Canvas(p: CanvasProps) {
         </button>
       )}
       <div className={`fb-item fb-submit-wrap${sel({ kind: 'submit' }) ? ' on' : ''}`} onClick={() => onSelect({ kind: 'submit' })}>
-        <div className="pc-bk-submit fb-submit"><Inline value={value.submitLabel} onChange={v => p.patch({ submitLabel: v }, 'submit')} placeholder={submitFallback} max={80} label="Submit button label" /></div>
+        <div className="pc-bk-submit fb-submit"><Inline value={value.submitLabel} onChange={v => p.patch({ submitLabel: v }, 'submit')} placeholder={source?.submitLabel || submitFallback} max={80} label="Submit button label" /></div>
       </div>
     </div>
   );
 }
 
-function Item({ field: f, prefix, on, onSelect, patchField, onLabelDone, onInsertAfter, onDuplicate, onRemove }: CanvasProps & { field: FormField; prefix: string; on: boolean }) {
+function Item({ field: f, prefix, on, onSelect, patchField, onLabelDone, onInsertAfter, onDuplicate, onRemove, source, words }: CanvasProps & { field: FormField; prefix: string; on: boolean }) {
   const id = `${prefix}-${f.id}`;
-  const label = <Inline value={f.label} onChange={v => patchField(f.id, { label: v }, `label:${f.id}`)} onDone={() => onLabelDone(f.id)} placeholder={META[f.type].fresh} max={200} label={`${META[f.type].label} label`} />;
+  // the main-language question while writing another language
+  const main = source?.fields.find(x => x.id === f.id);
+  const hasHelp = Boolean(f.help || main?.help || on);
+  const label = <Inline value={f.label} onChange={v => patchField(f.id, { label: v }, `label:${f.id}`)} onDone={() => onLabelDone(f.id)} placeholder={main?.label || META[f.type].fresh} max={200} label={`${META[f.type].label} label`} />;
   const req = f.required ? <span className="fb-req-mark" aria-hidden="true"> *</span> : null;
-  const help = (f.help || on) ? <small className="fb-help"><Inline value={f.help} onChange={v => patchField(f.id, { help: v }, `help:${f.id}`)} placeholder={f.type === 'heading' ? 'Add a description (optional)' : 'Add help text (optional)'} max={300} label="Help text" /></small> : null;
-  const control = <div className="fb-control" inert dangerouslySetInnerHTML={{ __html: renderControl(f, '', id) }} />;
+  const help = hasHelp ? <small className="fb-help"><Inline value={f.help} onChange={v => patchField(f.id, { help: v }, `help:${f.id}`)} placeholder={main?.help || (f.type === 'heading' ? 'Add a description (optional)' : 'Add help text (optional)')} max={300} label="Help text" /></small> : null;
+  const control = <div className="fb-control" inert dangerouslySetInnerHTML={{ __html: renderControl(f, '', id, words) }} />;
   const body = f.type === 'heading'
-    ? <div className="pc-form-heading"><h3>{label}</h3>{(f.help || on) && <p><Inline value={f.help} onChange={v => patchField(f.id, { help: v }, `help:${f.id}`)} placeholder="Add a description (optional)" max={300} label="Section description" /></p>}</div>
+    ? <div className="pc-form-heading"><h3>{label}</h3>{hasHelp && <p><Inline value={f.help} onChange={v => patchField(f.id, { help: v }, `help:${f.id}`)} placeholder={main?.help || 'Add a description (optional)'} max={300} label="Section description" /></p>}</div>
     : f.type === 'checkbox' || f.type === 'consent'
       ? <div className="pc-bk-check"><input type="checkbox" tabIndex={-1} aria-hidden="true" readOnly checked={false} /><span>{label}{req}{help}</span></div>
       : f.type === 'radio' || f.type === 'checkboxes'
         ? <div className="pc-bk-field pc-bk-choices"><div className="fb-legend">{label}{req}</div>{control}{help}</div>
         : <div className="pc-bk-field"><span>{label}{req}</span>{control}{help}</div>;
   return (
-    <div className={`fb-item${on ? ' on' : ''}${isHalf(f) ? ' is-half' : ''}`} data-item={f.id} tabIndex={-1} aria-label={`${META[f.type].label}: ${f.label}`}
+    <div className={`fb-item${on ? ' on' : ''}${isHalf(f) ? ' is-half' : ''}`} data-item={f.id} tabIndex={-1} aria-label={`${META[f.type].label}: ${f.label || main?.label || ''}`}
       onClick={e => { onSelect({ kind: 'field', id: f.id }); if (!(e.target as HTMLElement).closest('.fb-inline, button')) e.currentTarget.focus({ preventScroll: true }); }}>
       {body}
       {on && (
@@ -119,13 +126,18 @@ function Item({ field: f, prefix, on, onSelect, patchField, onLabelDone, onInser
   );
 }
 
-/** Interactive preview: type, tick and press the button to check validation. Nothing is sent. */
-export function Preview({ value, system, event, device }: { value: FormDefinition; system: SystemField[]; event: boolean; device: 'desktop' | 'phone' }) {
+/**
+ * Interactive preview: type, tick and press the button to check validation.
+ * Nothing is sent. lang: the language previewed (`value` is already in it),
+ * for the form's own words around the questions.
+ */
+export function Preview({ value, system, event, device, lang = '' }: { value: FormDefinition; system: SystemField[]; event: boolean; device: 'desktop' | 'phone'; lang?: string }) {
   const [result, setResult] = useState<{ ok: boolean; text: string } | null>(null);
   const formRef = useRef<HTMLFormElement>(null);
   const e = escapeForm;
-  const sys = system.map((f, i) => renderField({ id: `sys${i}`, type: f.type, label: f.label, required: f.type !== 'select', help: '', options: f.type === 'select' ? ['1', '2'] : [] }, '', 'pv-sys')).join('');
-  const html = `${value.title ? `<h2>${e(value.title)}</h2>` : ''}${value.intro ? `<p class="fb-pv-intro">${e(value.intro)}</p>` : ''}${sys}${renderFields(value, {}, 'pv')}`;
+  const w = formStrings(lang), rsvp = rsvpStrings(lang);
+  const sys = system.map((f, i) => renderField({ id: `sys${i}`, type: f.type, label: f.label, required: f.type !== 'select', help: '', options: f.type === 'select' ? ['1', '2'] : [] }, '', 'pv-sys', w)).join('');
+  const html = `${value.title ? `<h2>${e(value.title)}</h2>` : ''}${value.intro ? `<p class="fb-pv-intro">${e(value.intro)}</p>` : ''}${sys}${renderFields(value, {}, 'pv', w)}`;
   const key = JSON.stringify(value);
   return (
     <div className={`fb-pv-frame ${device}`}>
@@ -136,13 +148,13 @@ export function Preview({ value, system, event, device }: { value: FormDefinitio
           const data = new FormData(ev.currentTarget);
           try {
             const error = firstError(value, answersFrom(name => data.getAll(name), value));
-            setResult(error ? { ok: false, text: error } : { ok: true, text: value.confirmation || (event ? 'Your seat is saved.' : 'Thank you. Your response has been received.') });
+            setResult(error ? { ok: false, text: error } : { ok: true, text: event ? value.confirmation || 'Your seat is saved.' : thanksText(value.confirmation, w) });
           } catch (err) { setResult({ ok: false, text: err instanceof Error ? err.message : 'Invalid answer.' }); }
         }}
       >
         <div dangerouslySetInnerHTML={{ __html: html }} />
         {result && <p className={`fb-pv-result ${result.ok ? 'ok' : 'bad'}`} role="status">{result.ok ? <><b>Looks good.</b> Visitors would see: “{result.text}” Nothing was sent.</> : result.text}</p>}
-        <button type="submit" className="pc-bk-submit">{value.submitLabel || (event ? 'Confirm my seat' : 'Submit')}</button>
+        <button type="submit" className="pc-bk-submit">{value.submitLabel || (event ? rsvp.confirmSeat : w.submit)}</button>
       </form>
     </div>
   );