@acms-subir/core 0.3.52 → 0.3.53

package/src/lib/forms/validate.ts

@@ -1,6 +1,7 @@
 // Pure answer reading + validation, shared by the server (collectResponse,
 // readAnswers) and the builder's preview. No server imports here.
 import { answerFields, hasOther, type FormDefinition, type FormField } from './schema';
+import { mainChoice } from './localize';
 
 /** Value of the "Other" radio/checkbox; its text arrives as `o_<field id>`. */
 export const OTHER = '__other__';
@@ -28,12 +29,19 @@ export function answersFrom(getAll: (name: string) => unknown[], definition: Pic
   return answers;
 }
 
-/** Validates one answer and returns its stored form. Throws AnswerError with a visitor-facing message. */
+/** HH:mm, 24-hour (an hour without its leading zero is fine: "9:05" is stored "09:05"). */
+const TIME = /^([01]?\d|2[0-3]):([0-5]\d)$/;
+
+/**
+ * Validates one answer and returns its stored form. Throws AnswerError with a
+ * visitor-facing message. A choice may come in any of the form's languages;
+ * it's stored as the main-language choice.
+ */
 export function checkAnswer(f: FormField, raw: unknown): string {
   if (typeof raw !== 'string' || raw.length > 2000) throw new AnswerError(`“${f.label}” is too long.`);
   if (f.type === 'heading') return '';
   if (f.type === 'checkboxes') {
-    const items = raw.split('\n').map(s => s.trim()).filter(Boolean);
+    const items = raw.split('\n').map(s => s.trim()).filter(Boolean).map(s => mainChoice(f, s) ?? s);
     const extra = items.filter(i => !f.options.includes(i));
     if (f.required && !items.length) throw new AnswerError(`Please answer “${f.label}”.`);
     if (new Set(items).size !== items.length || extra.length > (hasOther(f) ? 1 : 0) || extra.some(e => e.length > 200)) throw invalid(f);
@@ -48,8 +56,12 @@ export function checkAnswer(f: FormField, raw: unknown): string {
   if (f.type === 'email') valid = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value);
   if (f.type === 'number') valid = /^[-+]?(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?$/i.test(value) && Number.isFinite(Number(value));
   if (f.type === 'date') valid = /^\d{4}-\d{2}-\d{2}$/.test(value) && Number.isFinite(Date.parse(value)) && new Date(value).toISOString().slice(0, 10) === value;
-  if (f.type === 'select') valid = f.options.includes(value);
-  if (f.type === 'radio') valid = f.options.includes(value) || (hasOther(f) && value.length <= 200 && !value.includes('\n'));
+  if (f.type === 'time') { const m = TIME.exec(value); valid = Boolean(m); if (m) value = `${m[1].padStart(2, '0')}:${m[2]}`; }
+  if (f.type === 'select' || f.type === 'radio') {
+    const main = mainChoice(f, value);
+    if (main !== undefined) value = main;
+    else valid = f.type === 'radio' && hasOther(f) && value.length <= 200 && !value.includes('\n');
+  }
   if (agree) valid = value === 'yes';
   if (f.type === 'phone') valid = value.length <= 40 && /^[+\d().\s-]+$/.test(value);
   if (f.type === 'url') {

package/src/lib/forms/words.ts

@@ -0,0 +1,32 @@
+// The public form's own words, around the ones its author wrote: the button
+// and the thank-you when the form has none, the dropdown's empty choice,
+// "Other" with its text box, and "Send another response". In the page's
+// language (/forms/<id> and /es/forms/<id>, an event's RSVP questions); the
+// author's own words come from the form and its translations. {label}: the
+// question (live/words.ts `fill`). Other languages fall back to English.
+import { DEFAULT_THANKS } from './schema';
+
+export interface FormStrings {
+  submit: string;
+  thanks: string;
+  choose: string;
+  other: string;
+  typeAnswer: string;
+  /** read out for the "Other" text box */
+  otherAnswer: string;
+  sendAnother: string;
+}
+
+const STRINGS: Record<string, FormStrings> = {
+  en: { submit: 'Submit', thanks: 'Thank you. Your response has been received.', choose: 'Choose…', other: 'Other', typeAnswer: 'Type your answer', otherAnswer: 'Other answer for {label}', sendAnother: 'Send another response' },
+  es: { submit: 'Enviar', thanks: 'Gracias. Recibimos tu respuesta.', choose: 'Elige…', other: 'Otro', typeAnswer: 'Escribe tu respuesta', otherAnswer: 'Otra respuesta para {label}', sendAnother: 'Enviar otra respuesta' },
+  fr: { submit: 'Envoyer', thanks: 'Merci. Votre réponse a bien été reçue.', choose: 'Choisir…', other: 'Autre', typeAnswer: 'Saisissez votre réponse', otherAnswer: 'Autre réponse pour {label}', sendAnother: 'Envoyer une autre réponse' },
+  de: { submit: 'Senden', thanks: 'Danke. Ihre Antwort ist eingegangen.', choose: 'Auswählen…', other: 'Andere', typeAnswer: 'Ihre Antwort', otherAnswer: 'Andere Antwort für {label}', sendAnother: 'Weitere Antwort senden' },
+  pt: { submit: 'Enviar', thanks: 'Obrigado. Recebemos sua resposta.', choose: 'Escolha…', other: 'Outro', typeAnswer: 'Digite sua resposta', otherAnswer: 'Outra resposta para {label}', sendAnother: 'Enviar outra resposta' },
+};
+
+export const formStrings = (locale: string | null | undefined): FormStrings =>
+  STRINGS[(locale || 'en').toLowerCase().split('-')[0]] ?? STRINGS.en;
+
+/** The form's thank-you, or the page's own words when it has none (or still has the default one). */
+export const thanksText = (confirmation: string, w: FormStrings) => (confirmation.trim() && confirmation !== DEFAULT_THANKS ? confirmation : w.thanks);

package/src/lib/mobile/forms.ts

@@ -3,17 +3,24 @@ import type { ContentRepository } from '../repo/types';
 import type { FormDefinition, SavedForm } from '../forms/schema';
 import { collectResponse, formVersion } from '../forms/service';
 import { saveResponse } from '../forms/alerts';
+import { localizeForm } from '../forms/localize';
+import { formStrings, thanksText } from '../forms/words';
 import { ApiError, readJson } from '../api';
 import { sha256Hex } from '../api-keys';
+import { I18N } from '../i18n';
+import { isExtraLocale } from '../translations';
+import { siteLang } from '../dates';
 import { queryParams } from './http';
 import { requireAccess } from './access';
+import { localeOnlyQuery, mobileLocale } from './locale';
 import type { PublicContext } from './route';
 
-// Published general forms for apps: read the questions, send answers. The
-// same validation and storage as the web form (/forms/<id>), plus app
-// limits: an Idempotency-Key per response (retries never duplicate), 10
-// responses per address per form per minute, and a per-form daily ceiling
-// from Admin → Mobile app so one form can't be flooded.
+// Published general forms for apps: read the questions (in the app's
+// language with ?locale=), send answers. The same validation and storage as
+// the web form (/forms/<id>), plus app limits: an Idempotency-Key per
+// response (retries never duplicate), 10 responses per address per form per
+// minute, and a per-form daily ceiling from Admin → Mobile app so one form
+// can't be flooded.
 
 const UUID4 = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
@@ -25,10 +32,15 @@ async function publishedForm(repo: ContentRepository, id: string): Promise<Saved
   return form;
 }
 
-/** A form's questions for apps; `version` is the one collectResponse accepts (also for event RSVPs). */
-export async function formJson(d: FormDefinition) {
+/**
+ * A form's questions for apps, in `locale` (the main-language words where it
+ * has none; never the translations themselves); `version` is the one
+ * collectResponse accepts (also for event RSVPs), the same in every language.
+ */
+export async function formJson(definition: FormDefinition, locale?: string | null) {
+  const d = localizeForm(definition, isExtraLocale(locale) ? locale : '');
   return {
-    version: await formVersion(d),
+    version: await formVersion(definition),
     title: d.title, intro: d.intro, submitLabel: d.submitLabel, confirmation: d.confirmation,
     fields: d.fields.map((f) => ({
       id: f.id, type: f.type, label: f.label, required: f.required, help: f.help, options: f.options,
@@ -37,12 +49,26 @@ export async function formJson(d: FormDefinition) {
   };
 }
 
+/** the language a request asks for (`?locale=`), or the site's main one */
+function formLocale(url: URL, read: boolean) {
+  if (read) return mobileLocale(localeOnlyQuery.parse(queryParams(url)).locale);
+  // sending answers never fails over the language: one the site doesn't
+  // have gets the main language's thank-you (the response is the same)
+  const locale = url.searchParams.get('locale');
+  return locale && I18N.locales.includes(locale) ? locale : I18N.defaultLocale || null;
+}
+// the button and thank-you when the form has none, in the request's language (else the site's)
+async function ownWords(repo: ContentRepository, locale: string | null) {
+  return formStrings(locale ?? siteLang(await repo.getSettings()));
+}
+
 export async function getForm(repo: ContentRepository, url: URL, id: string) {
-  z.object({}).strict().parse(queryParams(url));
+  const locale = formLocale(url, true);
   await requireAccess(repo, 'forms');
   const form = await publishedForm(repo, id);
-  const d = form.definition;
-  return { id: form.id, ...await formJson(d), title: d.title || form.name, submitLabel: d.submitLabel || 'Submit' };
+  const json = await formJson(form.definition, locale);
+  const w = await ownWords(repo, locale);
+  return { id: form.id, ...json, title: json.title || form.name, submitLabel: json.submitLabel || w.submit, confirmation: thanksText(json.confirmation, w) };
 }
 
 // field id → answer; checkbox groups send a list. "Other" answers send the typed text.
@@ -60,6 +86,7 @@ export const formResponseInput = z.object({
 }).strict();
 
 export async function submitFormResponse(c: PublicContext) {
+  const locale = formLocale(c.url, false);
   const settings = await requireAccess(c.repo, 'forms');
   const id = c.params.id ?? '';
   const key = c.request.headers.get('idempotency-key') ?? '';
@@ -77,12 +104,17 @@ export async function submitFormResponse(c: PublicContext) {
     const unchanged = JSON.stringify((JSON.parse(prior) as { definition: unknown }).definition) === JSON.stringify(form.definition);
     if (unchanged && JSON.stringify(await collectResponse(form.definition, answers, body.version)) !== prior)
       throw new ApiError(409, 'This request was already submitted with different answers. Reload to send a new response.');
-    return { received: true as const, confirmation: form.definition.confirmation };
+    return receipt(c.repo, form, locale);
   }
   const response = await collectResponse(form.definition, answers, body.version);
   // only valid new responses count toward the daily ceiling
   const cap = settings.mobileAccess.responsesPerFormDay;
   if (cap && !await c.repo.email.rateLimit(`forms:day:${form.id}`, cap, 86_400_000)) throw new ApiError(429, 'This form has had a lot of responses today. Please try again tomorrow.', 86_400);
   await saveResponse(c.repo, form, response, key.toLowerCase(), { via: 'app', locals: c.locals });
-  return { received: true as const, confirmation: form.definition.confirmation };
+  return receipt(c.repo, form, locale);
+}
+// the thank-you in the app's language (?locale=), as the web form shows it
+async function receipt(repo: ContentRepository, form: SavedForm, locale: string | null) {
+  const d = localizeForm(form.definition, isExtraLocale(locale) ? locale : '');
+  return { received: true as const, confirmation: thanksText(d.confirmation, await ownWords(repo, locale)) };
 }

package/src/lib/mobile/openapi.ts

@@ -61,7 +61,7 @@ export async function getOpenApi(_repo: ContentRepository, url: URL) {
     ['/announcements/{id}', 'One announcement that is up, in the requested language; requires announcements', localeOnlyQuery, ref('AnnouncementDetail')],
     ['/links', 'The links page: profile, socials and visible blocks in order (owner switch: links)', empty, ref('Links')],
     ['/live', 'Live video status: the current broadcast (or null), server time and the owner’s display choices; never cached; 404 while live video is off', empty, ref('LiveStatus'), false],
-    ['/forms/{id}', 'A published form’s questions; 410 when it stopped accepting responses (owner switch: forms)', empty, ref('Form')],
+    ['/forms/{id}', 'A published form’s questions, in the requested language (locale: its labels, help, choices, button and thank-you there; words it has no translation for stay in the main language; version is the same in every language); 410 when it stopped accepting responses (owner switch: forms)', localeOnlyQuery, ref('Form')],
     ['/openapi.json', 'OpenAPI 3.1 document (no v1 envelope)', empty, { type: 'object', required: ['openapi', 'info', 'paths', 'components'] }],
   ];
   for (const [path, summary, query, schema, cache = true] of reads) {
@@ -114,8 +114,8 @@ export async function getOpenApi(_repo: ContentRepository, url: URL) {
   paths['/api/v1/bookings/manage/ics'] = { get: { summary: 'Calendar file for the booking (text/calendar, no v1 envelope)', parameters: [bookingToken],
     responses: { ...errors, 200: { description: 'An iCalendar file.', content: { 'text/calendar': { schema: { type: 'string' } } } } } }, ...cors };
   paths['/api/v1/forms/{id}/responses'] = { post: { ...priv('Send a response to a published form', ref('FormReceipt'), { body: formResponseInput, write: true, status: 201,
-    description: 'Same validation as the web form. Idempotency-Key (UUID v4) is the response id: retries never duplicate. 10 responses per address per form per minute, plus the owner’s daily ceiling per form (429). version from GET /forms/{id}: a changed form answers 409. Leave website empty (spam trap).' }),
-    parameters: [{ name: 'id', in: 'path', required: true, schema: { type: 'string' } }, { name: 'Idempotency-Key', in: 'header', required: true, schema: { type: 'string', format: 'uuid' } }] }, ...cors };
+    description: 'Same validation as the web form. Idempotency-Key (UUID v4) is the response id: retries never duplicate. 10 responses per address per form per minute, plus the owner’s daily ceiling per form (429). version from GET /forms/{id}: a changed form answers 409 (a translation alone doesn’t change it). A choice may be sent as shown in the requested language or in the main one; it is stored as the main-language choice. A time answer is HH:mm (24-hour). locale: the confirmation in that language (one the site doesn’t have gets the main language’s). Leave website empty (spam trap).' }),
+    parameters: [{ name: 'id', in: 'path', required: true, schema: { type: 'string' } }, { name: 'locale', in: 'query', required: false, schema: { type: 'string', minLength: 1, maxLength: 35 } }, { name: 'Idempotency-Key', in: 'header', required: true, schema: { type: 'string', format: 'uuid' } }] }, ...cors };
   const guestNote = 'Guest sign-in needs the calendar, working email, EMAIL_ENCRYPTION_KEY and the owner switch guestSignIn (site.features.guestSignIn); 404 otherwise.';
   paths['/api/v1/guest/code'] = { post: priv('Email a 6-digit sign-in code (always answers the same, whether or not the address has bookings)', ref('GuestCodeSent'), { body: codeInput, write: true, status: 202,
     description: `${guestNote} Codes last 10 minutes; a new request voids the old code. 3 codes per address and 20 per client address per 15 minutes.` }), ...cors };

package/src/lib/mobile/rsvp.ts

@@ -61,7 +61,9 @@ export async function getRsvpStatus(repo: ContentRepository, url: URL, slug: str
   const closed = rsvpClosed(o, settings);
   const deadline = rsvp.enabled ? rsvpDeadline(o, settings) : null;
   const reason = closed ?? (left === 0 ? 'full' as const : null);
-  const form = rsvpQuestions(o.event);
+  const questions = rsvpQuestions(o.event);
+  // the questions in the app's language, where the form has its words
+  const form = questions ? await formJson(questions, locale) : null;
   const title = localizeDoc(o.event, locale ?? undefined).title;
   // the built-in button speaks the app's language (the site's own without languages set up)
   let submitLabel = form?.submitLabel ?? '';
@@ -79,6 +81,6 @@ export async function getRsvpStatus(repo: ContentRepository, url: URL, slug: str
     maxSeats: Math.min(rsvp.maxSeats || 1, left ?? Infinity), autoConfirm: rsvp.autoConfirm,
     // a full date takes places in line: how many people wait, for how many seats, and the most one may ask for
     waitlist: { enabled: waitlistOn(o.event), waiting: line.length, seats: line.reduce((n, b) => n + b.seats, 0), maxSeats: rsvp.maxSeats || 1 },
-    form: form ? { ...await formJson(form), submitLabel } : null,
+    form: form ? { ...form, submitLabel } : null,
   };
 }

package/src/lib/mobile/schemas.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { CalEvent, Booking, Calendar, BookingQuestion, LinksAvatarShape, LinksAvatarFit, LinksAvatarScale } from '../schema';
+import { FIELD_TYPES } from '../forms/schema';
 
 const str = z.string(), bool = z.boolean(), strings = z.array(str);
 const date = str.datetime(), locale = str.nullable();
@@ -73,7 +74,8 @@ export const Links = z.object({
 export const Form = z.object({
   id: str, version: str, title: str, intro: str, submitLabel: str, confirmation: str,
   fields: z.array(z.object({
-    id: str, type: z.enum(['text', 'textarea', 'email', 'phone', 'number', 'select', 'checkbox', 'date', 'radio', 'checkboxes', 'url', 'consent', 'heading']),
+    // time: 24-hour HH:mm. An app that doesn't know a type can ask it as short text; the site checks the answer
+    id: str, type: z.enum(FIELD_TYPES),
     label: str, required: bool, help: str, options: strings, placeholder: str, width: z.enum(['full', 'half']), allowOther: bool,
   })),
 });

package/src/pages/[...slug].astro

@@ -22,7 +22,7 @@ const isAdmin = (await validateRequestSession(Astro.request, Astro.cookies, Astr
 if (!page || (page.status !== 'published' && !isAdmin)) {
   return new Response(null, { status: 404, statusText: 'Not found' });
 }
-const bodyHtml = page.bodyHtml ? highlightCodeHtml(await expandDynamicBlocks(page.bodyHtml, repo)) : '';
+const bodyHtml = page.bodyHtml ? highlightCodeHtml(await expandDynamicBlocks(page.bodyHtml, repo, locale)) : '';
 // ?designPreview=1 (admin-only) renders the staged Design-screen changes
 const baseSettings = await effectiveSettings(await repo.getSettings(), Astro.url, Astro.cookies, Astro.locals);
 const settings = isExtraLocale(locale) ? { ...baseSettings, locale } : baseSettings;

package/src/pages/admin/forms/[id].astro

@@ -3,14 +3,18 @@ import Admin from '../../../layouts/Admin.astro';
 import FormHeader from '../../../components/forms/FormHeader.astro';
 import FormBuildPage from '../../../components/forms/FormBuildPage';
 import { getRepo } from '../../../lib/repo';
+import { I18N, extraLocales, localeName } from '../../../lib/i18n';
 import '../../../styles/forms.css';
 // Build tab. Edits autosave as a draft through the `forms.save` action;
 // "Publish changes" makes them live. See components/forms/FormBuildPage.tsx.
+// With more than one site language, a switcher writes the form's words in each.
 const repo = await getRepo(Astro.locals);
 const form = await repo.forms.get(Astro.params.id || '');
 if (!form) return new Response(null, { status: 404 });
 Astro.response.headers.set('Cache-Control', 'private, no-store');
 const responses = form.kind === 'form' && form.purpose === 'general' ? (await repo.forms.submissions(form.id, 1)).length : 0;
+const languages = extraLocales().map((code) => ({ code, name: localeName(code, true) }));
+const mainLanguage = { code: I18N.defaultLocale || 'en', name: localeName(I18N.defaultLocale || 'en', true) };
 ---
 <Admin title={form.name} section="forms" wide>
   <FormHeader form={form} active="build">
@@ -23,5 +27,7 @@ const responses = form.kind === 'form' && form.purpose === 'general' ? (await re
     form={{ id: form.id, name: form.name, kind: form.kind, purpose: form.purpose, status: form.status, revision: form.revision, hasDraft: Boolean(form.draft) }}
     definition={form.draft ?? form.definition}
     responses={responses}
+    languages={languages}
+    mainLanguage={mainLanguage}
   />
 </Admin>

package/src/pages/blog/[slug].astro

@@ -63,7 +63,7 @@ const po = design.post;
 const PostTemplate = (post.template ? design.theme.postTemplates[post.template] : null) as any;
 const tagSlug = (name: string) =>
   tags.find((t) => t.name.toLowerCase() === name.toLowerCase())?.slug ?? slugify(name);
-const html = highlightCodeHtml(await expandDynamicBlocks(post.bodyHtml || renderMarkdown(post.body), repo));
+const html = highlightCodeHtml(await expandDynamicBlocks(post.bodyHtml || renderMarkdown(post.body), repo, locale));
 const fmt = (ts: number | null) => formatDate(ts, settings);
 const words = (post.bodyHtml || post.body).replace(/<[^>]+>/g, ' ').split(/\s+/).filter(Boolean).length;
 const readMins = Math.max(1, Math.round(words / 220));

package/src/pages/events/[slug].astro

@@ -3,6 +3,8 @@ import { ApiError } from '../../lib/api';
 import { starter } from '../../lib/forms/schema';
 import { formVersion } from '../../lib/forms/service';
 import { renderFields, hiddenFields } from '../../lib/forms/render';
+import { localizeForm } from '../../lib/forms/localize';
+import { formStrings } from '../../lib/forms/words';
 import { readForm, readAnswers, submissionGuard } from '../../lib/forms/http';
 import { submitEventForm, prepareLegacyEventForm } from '../../lib/forms/events';
 import { I18N, localePath, requestLocale } from '../../lib/i18n';
@@ -74,22 +76,26 @@ if (Astro.request.method === 'POST' && event.rsvp.enabled) {
   }
 }
 const formHtml = hiddenFields(await formVersion(definition), requestId) + `<input type="hidden" name="occurrence" value="${occurrence.start}">`;
+// the questions in the page's language (main-language words where the form has none)
+const fieldsHtml = renderFields(localizeForm(definition, isExtraLocale(locale) ? locale : ''), formValues, 'event-registration', formStrings((I18N.enabled ? locale : '') || siteLang(settings)));
 const taken = event.rsvp.enabled ? await seatsTaken(repo, event.id, occurrence.start) : 0;
 // the event's RSVP deadline for this date (null: open until it ends)
 const closesAt = event.rsvp.enabled ? rsvpDeadline(occurrence, settings) : null;
 // waitlist: a full date offers "Join the waitlist" (the same form, posting waitlist=1)
 const rsvp = event.rsvp.enabled
-  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues,
+  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml, values: coreValues,
     open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt, waitlist: waitlistOn(event) }
   : null;
 const calendars = event.calendarIds.map((id) => calMap.get(id)).filter((c): c is NonNullable<typeof c> => Boolean(c) && c!.visibility !== 'private');
-const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo));
+const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo, locale));
 const upcoming = (await upcomingEvents(repo, settings, now, { limit: 4 })).filter((u) => u.event.id !== event.id).slice(0, 3);
 const pageUrl = origin + eventUrl(event.slug);
 const jsonLd = eventJsonLd(event, occurrence, settings, origin, pageUrl);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const Template = resolveDesign(settings).theme.EventTemplate as any;
-const props = { event, occurrence, settings, calendars, html, upcoming, origin, preview: event.status !== 'published', rsvp };
+// templates read the form's title, introduction and button from the event: in the page's language too
+const shownEvent = event.rsvp.form && isExtraLocale(locale) ? { ...event, rsvp: { ...event.rsvp, form: localizeForm(event.rsvp.form, locale) } } : event;
+const props = { event: shownEvent, occurrence, settings, calendars, html, upcoming, origin, preview: event.status !== 'published', rsvp };
 ---
 
 <Site

package/src/pages/forms/[id].astro

@@ -5,12 +5,24 @@ import { renderForm } from '../../lib/forms/render';
 import { collectResponse } from '../../lib/forms/service';
 import { readForm, readAnswers, submissionGuard } from '../../lib/forms/http';
 import { saveResponse } from '../../lib/forms/alerts';
+import { localizeForm } from '../../lib/forms/localize';
+import { formStrings, thanksText } from '../../lib/forms/words';
 import { ApiError } from '../../lib/api';
+import { I18N, localePath, requestLocale } from '../../lib/i18n';
+import { isExtraLocale } from '../../lib/translations';
+import { siteLang } from '../../lib/dates';
 const repo = await getRepo(Astro.locals);
 const form = await repo.forms.get(Astro.params.id || '');
 if (!form || form.status !== 'published' || form.kind !== 'form' || form.purpose !== 'general') return new Response(null, { status: 404 });
 Astro.response.headers.set('Cache-Control', 'private, no-store');
 const embed = Astro.url.searchParams.has('embed');
+// /es/forms/<id>: the form's Spanish words (main-language ones where it has
+// none) and the page's own words in Spanish; answers are stored the same
+const locale = requestLocale(Astro.url, Astro.locals);
+const formLocale = isExtraLocale(locale) ? locale : '';
+const lang = (I18N.enabled ? locale : '') || siteLang(await repo.getSettings());
+const shown = localizeForm(form.definition, formLocale);
+const path = localePath(`/forms/${encodeURIComponent(form.id)}`, locale);
 let error = '', success = false, values: Record<string,string> = {};
 let requestId: string = crypto.randomUUID();
 if (Astro.request.method === 'POST') {
@@ -18,11 +30,17 @@ if (Astro.request.method === 'POST') {
     const data = await readForm(Astro.request);
     requestId = await submissionGuard(repo, data, Astro.clientAddress, `form:${form.id}`);
     values = readAnswers(data, form.definition);
-    const response = await collectResponse(form.definition, values, String(data.get('formVersion') || ''));
-    await saveResponse(repo, form, response, requestId, { via: 'web', locals: Astro.locals });
+    // a resubmit of a saved response (refresh, double click) thanks them again,
+    // also after the form changed since; the same id with other answers is a 409
+    const prior = await repo.forms.receipt(form.id, requestId);
+    if (!prior || JSON.stringify((JSON.parse(prior) as { definition: unknown }).definition) === JSON.stringify(form.definition)) {
+      const response = await collectResponse(form.definition, values, prior ? undefined : String(data.get('formVersion') || ''));
+      await saveResponse(repo, form, response, requestId, { via: 'web', locals: Astro.locals });
+    }
     success = true;
   } catch (e) { error = e instanceof ApiError ? e.message : 'Could not save your response. Please try again.'; Astro.response.status = e instanceof ApiError ? e.status : 500; }
 }
-const html = success ? '' : await renderForm(form.id, form.definition, values, error, requestId, embed);
+const w = formStrings(lang);
+const html = success ? '' : await renderForm(form.id, form.definition, values, error, requestId, embed, { locale: formLocale, lang, action: path });
 ---
-<Site title={form.definition.title || form.name} noindex bare={embed}>{success ? <section class="pc-simple-form"><h1>{form.definition.title || form.name}</h1><p role="status">{form.definition.confirmation || 'Thank you. Your response has been received.'}</p><a href={Astro.url.pathname + (embed ? '?embed=1' : '')}>Send another response</a></section> : <div set:html={html}/>}</Site>
+<Site title={shown.title || form.name} noindex bare={embed}>{success ? <section class="pc-simple-form"><h1>{shown.title || form.name}</h1><p role="status">{thanksText(shown.confirmation, w)}</p><a href={path + (embed ? '?embed=1' : '')}>{w.sendAnother}</a></section> : <div set:html={html}/>}</Site>

package/src/pages/index.astro

@@ -46,7 +46,7 @@ const [posts, tags] = HomeTemplate
   : [[], []];
 // expand dynamic blocks (post lists) in the page body for BOTH paths — a theme
 // template injects the body as its hero, so it must receive expanded HTML too
-const homeHtml = home?.bodyHtml ? await expandDynamicBlocks(home.bodyHtml, repo) : '';
+const homeHtml = home?.bodyHtml ? await expandDynamicBlocks(home.bodyHtml, repo, locale) : '';
 const homeForTemplate = home ? { ...home, bodyHtml: homeHtml } : null;
 ---
 

package/src/styles/forms.css

@@ -81,6 +81,7 @@
 .fb.is-preview .fb-canvas { border: 0; }
 .fb-wide .fb-canvas:has(> .fb-float) { padding-top: 48px; }
 .fb-float { position: absolute; top: 8px; right: 10px; z-index: 3; display: flex; gap: 2px; padding: 2px; border-radius: 10px; background: color-mix(in srgb, var(--panel-2) 85%, transparent); }
+.fb-float-l { right: auto; left: 10px; }
 .fb-paper {
   /* the public form's tokens, mapped onto the admin palette */
   --ink: var(--text); --line-2: var(--line-strong); --btn: var(--text); --btn-ink: var(--bg); --accent-text: var(--accent-deep);
@@ -195,6 +196,13 @@
 .fb-choice.dragging input { box-shadow: var(--shadow-pop); }
 .fb-choice input { min-height: 34px; }
 .fb-choice-add { margin: 2px 0 0; font-size: 12px; color: var(--muted); }
+/* another language: the main language's words above each box, choices side by side */
+.fb-src { display: block; padding: 6px 9px; border-radius: var(--r-sm); background: var(--panel-2); color: var(--text-2); font-size: 12.5px; line-height: 1.45; white-space: pre-line; overflow-wrap: anywhere; max-height: 7.5em; overflow: auto; }
+.fb-src > span { display: block; font-size: 10.5px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.06em; color: var(--muted); margin-bottom: 1px; }
+.fb-tr-choices { display: grid; gap: 6px; }
+.fb-tr-choice { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1.4fr); gap: 8px; align-items: center; }
+.fb-tr-choice > span { font-size: 12.5px; color: var(--text-2); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.fb-tr-choice input { min-height: 34px; }
 
 /* menus */
 .fb-more, .fb-q-more { position: relative; flex: none; }