@acms-subir/core 0.3.37 → 0.3.39

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @acms-subir/core
 
+## 0.3.39
+
+### Patch Changes
+
+- 4c33f48: **When an event changes** in **Admin → Mobile app** now takes a list of rules (up to 10), each with its own calendars, **Only events tagged** and **Send to**. Use **Add a rule** to add one and **Remove** to take one away; with no rules, change notices are off. A site can now send classes tagged "Class" in a shared rooms calendar to a `classes` topic, and every event in its Events calendar to that event's own topics (Events and its calendar). An event that several rules cover gets one notice, sent to all of their topics, so each phone gets it once. Events in the app API list those same topics in `notify.changes`. The rule you already have becomes the first rule, with nothing to redo.
+- 527ba2f: Events can stop taking RSVPs before they happen. In the event's CTA card (Built-in form), a one-time event sets when RSVPs close (a date and time in the event's time zone), and a repeating one closes each date some hours or days before it starts ("Close RSVPs 2 hours before each date", up to 60 days). Until then the event page says "RSVPs close Fri, Oct 24 at 9 PM"; afterwards the form gives way to "RSVPs are closed." and "They closed on Fri, Oct 24. Questions? Contact us.", in the page's language. With no deadline, RSVPs stay open until the date ends, as before. The website and apps both turn late RSVPs away (410 in the app API). `GET /api/v1/events/:slug/rsvp` has `closesAt` (the date's deadline, or `null`) and the new reason `closed`, and events in the app API carry `rsvp.closesAt` and `rsvp.closeBefore`. Saves that leave the new settings out, from older editors and editor apps, keep them.
+
+  A second RSVP from the same email for the same date no longer takes more seats. The page says "You already have an RSVP for this date. We sent you an email with a link to change it. Need more seats? Change it there." and keeps the form, and the address gets its RSVP's link again by email, at most once every 10 minutes per RSVP, so the form can't flood someone's inbox. Nothing else about the RSVP is shown, since anyone can type an address. In the app API that's a 409 with the new error code `duplicate`. Cancelled and declined RSVPs don't count, and other dates are separate. The check is part of the same database write as the seat count, so two at once can't both get in.
+
+  The RSVP panel in the app recipes shows when RSVPs close, says when they closed, and shows the "You already have an RSVP" notice. Update it with `npx acms mobile recipe add rsvp --force`; that overwrites `components/RsvpPanel.tsx`, including any changes you made to it, and needs this release's `@acms-subir/native`. Theme event templates get `rsvp.closesAt` and `rsvp.duplicate`; a duplicate's words also come in `rsvp.error`, so templates that don't know it still say something.
+
+## 0.3.38
+
+### Patch Changes
+
+- 8d85520: `GET /api/v1/site?locale=es` returns the menu the way the `/es` header shows it: links to the Spanish pages, and the automatic menu's own words translated ("Inicio", "Enlaces"). Labels you wrote in Navigation stay as written. Events in the app API carry `notify.changes`, the push topics that hear when the event's date, time or place changes (Admin → Mobile app → When an event changes), or `[]`, so an app only promises "we'll let you know if it changes" when it's true. The RSVP panel recipe takes `children`, shown under the person's RSVP.
+- 7b71457: Event pages now follow the page's language, in English, Spanish, French, German and Portuguese (other languages stay in English). On `/es` event pages, and on a site whose main language is Spanish, a cancelled date said "Cancelled on … Other dates go ahead as usual." in English; now it says "Cancelado el domingo, 25 de octubre de 2026. Las demás fechas siguen como siempre.", so the "Cancelado el …" push opens a page that matches it. The same goes for a cancelled event, the "Cancelado" flag on event cards and in the calendar's pop-up, "Todo el día", the repeat line ("Todos los domingos", "El primer domingo de cada mes", "Cada 2 semanas, los lunes, 6 veces"), Agregar al calendario, Descargar .ics, Compartir and Enlace copiado, Más eventos, Ver el calendario completo, the map's labels and "Mostrando el …". Links on a `/es` event page (more events, the calendar, sharing) stay in Spanish. Theme event templates can use the same words with `eventStrings` and `describeRepeat` from `@acms-subir/core/theme`.
+
+  Booking and RSVP emails now speak the language the person used: the page's on the website (RSVPs from `/es` event pages, and bookings from `/es/book/…`, whose pages stay in English), the app's `locale` on `POST /api/v1/bookings`, and the site's main language for bookings staff add. The subject, message, details, dates and button are in that language, RSVPs show the event's translated title and place, and every link (the booking's own page, the calendar file) keeps it, such as `/es/book/manage/…`. Spanish emails say _usted_, like the privacy notice. In the app API, `manageUrl` (and the event's `url` from `GET /api/v1/bookings/manage`) points to the page in that language too. Staff notifications stay in the main language. Older bookings, and backups made before this release, use the main language. On a site whose main language isn't English, booking emails without a language (and staff notifications) now come in that language instead of English. Migration 60 adds `bookings.locale` (default `''`, the main language).
+
+  A room booking's own page (`/book/manage/…`, the page booking emails link to) now follows the page's language too, like an RSVP's: "Tu reservación está confirmada", Cambiar horario, Cancelar reservación and so on. Opened without `/es`, it shows the main language.
+
 ## 0.3.37
 
 ### Patch Changes

package/cli/migrations.generated.mjs

@@ -1111,6 +1111,11 @@ var MIGRATIONS = [
   { version: 59, statements: [
     `ALTER TABLE push_queue ADD COLUMN payload TEXT`,
     `ALTER TABLE push_queue ADD COLUMN due_at INTEGER`
+  ] },
+  // the language a booking or RSVP was made in (Booking.locale), so its
+  // emails and links follow it; '' = the main language, so older rows need no backfill
+  { version: 60, statements: [
+    `ALTER TABLE bookings ADD COLUMN locale TEXT NOT NULL DEFAULT ''`
   ] }
 ];
 var CURRENT_CONTENT_VERSION_COLUMNS = {

package/docs/mobile.md

@@ -120,7 +120,7 @@ Read the app's `AGENTS.md` too: it holds the same rules, next to the code.
 | `useSearch(text, { types, collection, limit })` | site-wide search: `data.posts`, `data.pages`, `data.events` (each with `snippet.text` + `snippet.highlights`), `data.more`; debounced, blank text fetches nothing |
 | `useEvents({ calendar, from, to, limit, q })` | `data.occurrences[]` (`start`, `end`, `allDay`, `event`) in a window (default 30 days, max 90). `from`/`to` take a site-local day (`'2026-10-01'`) or an ISO date-time with a zone (`new Date().toISOString()`) |
 | `useEvent(slug)` | one event |
-| `useRsvpStatus(slug, start)` / `useRsvp(slug, start)` | RSVP to one date (`start` exactly as `useEvents` returns it, a UTC ISO string) when `event.rsvp.enabled`: `open` or `reason` (`full`, `ended`, `cancelled`, `disabled`), live `going`/`left`, `maxSeats`, the questions in `form`; `answerProblems(form.fields, answers)` for inline errors. Needs only the calendar (`features.rsvp`). Keep `manageToken` in `expo-secure-store` to show or cancel the RSVP later (`useManagedBooking`, `useCancelBooking`) |
+| `useRsvpStatus(slug, start)` / `useRsvp(slug, start)` | RSVP to one date (`start` exactly as `useEvents` returns it, a UTC ISO string) when `event.rsvp.enabled`: `open` or `reason` (`full`, `ended`, `closed`, `cancelled`, `disabled`), `closesAt` (the deadline; `rsvpDeadlineText` words it), live `going`/`left`, `maxSeats`, the questions in `form`; `answerProblems(form.fields, answers)` for inline errors. One RSVP per email and date: `rsvp.duplicate` means that email already has one (the site emailed its link again); say so and keep the form. Needs only the calendar (`features.rsvp`). Keep `manageToken` in `expo-secure-store` to show or cancel the RSVP later (`useManagedBooking`, `useCancelBooking`) |
 | `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") |
 | `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` |

package/docs/theme-authoring.md

@@ -32,7 +32,7 @@ const { page, posts } = Astro.props;
 {posts.map(post => <PostCard href={collectionUrl(post.collection, post.slug)} title={post.title} excerpt={post.excerpt} />)}
 ```
 
-Public types: ChromeProps (site), HomeProps (settings, page, posts, tags), PageProps (settings, page, html), PostProps (settings, post, html, authors, related), EventProps (settings, event, occurrence, calendars, html, upcoming, origin, preview, rsvp), SectionProps (settings, page, variant, data). Public components: PostCard with card/row/feature variants, Pager with base/page/count, TagLabel with name/href/accent. Helpers include collectionUrl, postUrl, postsIndexUrl, tagUrl, formatDate, slugify, authorSlug, localeFromPath, localeHomeUrl and CONTENT. Use collectionUrl for non-default collections; postUrl is the built-in posts alias.
+Public types: ChromeProps (site), HomeProps (settings, page, posts, tags), PageProps (settings, page, html), PostProps (settings, post, html, authors, related), EventProps (settings, event, occurrence, calendars, html, upcoming, origin, preview, rsvp), SectionProps (settings, page, variant, data). Public components: PostCard with card/row/feature variants, Pager with base/page/count, TagLabel with name/href/accent. Helpers include collectionUrl, postUrl, postsIndexUrl, tagUrl, formatDate, slugify, authorSlug, localeFromPath, localeHomeUrl and CONTENT. For an event template, `eventStrings(lang)` gives the built-in event page's words (Cancelled, Add to calendar, Share, …) and `describeRepeat(event.rrule, event.start, formatDate?, lang)` its repeat line ("Weekly on Sunday", "Todos los domingos"), in English, Spanish, French, German or Portuguese, otherwise English. Use collectionUrl for non-default collections; postUrl is the built-in posts alias.
 
 ### Upcoming events in coded templates
 

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

@@ -1,17 +1,18 @@
-import { Fragment, useEffect, useState } from 'react';
+import { Fragment, useEffect, useState, type ReactNode } from 'react';
 import { ActivityIndicator, Platform, Pressable, Switch, Text, TextInput, View, type KeyboardTypeOptions } from 'react-native';
 import * as Crypto from 'expo-crypto';
 import * as SecureStore from 'expo-secure-store';
 import { isAcmsError, type FormField } from '@acms-subir/client';
-import { Button, answerProblemText, answerProblems, countWords, fill, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
+import { Button, answerProblemText, answerProblems, countWords, fill, rsvpDeadlineText, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
 
 // RSVP to one date of an event: <RsvpPanel slug={event.slug} start={occurrence.start} />,
 // with `start` exactly as useEvents returns it. Shows going and spots left,
 // seats, contact details and the event's questions, then the person's RSVP
 // with a way to cancel it; or why the date takes no RSVPs. Same rules as the
-// event's web page: open until the date ends, and the organiser may approve
-// each RSVP. useRsvp keeps one idempotency key per RSVP, so sending again
-// after a timeout can't register anyone twice. Its words come from
+// event's web page: open until the event's deadline or the date ends, one RSVP
+// per email and date, and the organiser may approve each RSVP. useRsvp keeps
+// one idempotency key per RSVP, so sending again after a timeout can't
+// register anyone twice. Its words come from
 // useStrings() in the app's language; the event's own form title, labels and
 // button win when the site has them.
 
@@ -37,7 +38,9 @@ const withOther = (f: FormField, value: string | string[] | undefined, other: st
 // a count in bold inside its words ("{count} going")
 const bold = (template: string, n: string) => template.split('{count}').map((part, i) => (i ? <Fragment key={i}><Text style={{ fontWeight: '700' }}>{n}</Text>{part}</Fragment> : part));
 
-export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
+// children: shown under the person's RSVP (not a declined one), e.g. an offer
+// to get notified if the date, time or place changes
+export function RsvpPanel({ slug, start, children }: { slug: string; start: string; children?: ReactNode }) {
   const t = useTheme();
   const words = useStrings();
   const { locale } = useLocale();
@@ -89,6 +92,8 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
   const errorText = [t.styles.text.small, { color: t.colors.ink, fontWeight: '600' as const }];
   const num = (n: number) => n.toLocaleString(locale);
   const seatsText = (n: number) => countWords(n, words.seat, words.seats, locale);
+  // "RSVPs close Fri, Oct 24 at 9 PM", or once past it "They closed on …"
+  const deadline = rsvpDeadlineText(s, words, locale);
   const going = (
     <Text style={t.styles.text.body}>
       {bold(s.going === 1 ? words.personGoing : words.peopleGoing, num(s.going))}
@@ -113,7 +118,7 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
     const who = mine?.booking.email ?? made!.email;
     const thanks = mine ? mine.confirmation : made!.formResponse?.definition.confirmation || null;
     const canCancel = !!stored && changes && (mine ? mine.can.cancel : false);
-    return (
+    return (<>
       <View style={[t.styles.card, { gap: 8 }]}>
         <Text accessibilityRole="header" style={t.styles.text.heading}>{!made ? words.yourRsvp : state === 'confirmed' ? words.confirmed : words.requestSent}</Text>
         <Text style={[t.styles.text.label, { color: t.colors.ink }]}>
@@ -136,14 +141,15 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
         {cancel.error && <Text style={errorText}>{isAcmsError(cancel.error) && cancel.error.status === 0 ? words.checkConnection : cancel.error.message}</Text>}
         {!canCancel && state !== 'declined' && <Text style={t.styles.text.small}>{words.changeByEmail}</Text>}
       </View>
-    );
+      {state !== 'declined' && children}
+    </>);
   }
 
   if (s.reason === 'disabled') return null;
   if (!s.open) return (
     <View style={[t.styles.card, { gap: 6 }]}>
       <Text accessibilityRole="header" style={t.styles.text.heading}>{s.reason === 'full' ? words.full : s.reason === 'cancelled' ? words.dateCancelled : words.rsvpClosed}</Text>
-      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : words.dateEnded}</Text>}
+      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : s.reason === 'closed' ? deadline || words.rsvpClosed : words.dateEnded}</Text>}
     </View>
   );
 
@@ -239,6 +245,7 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
       <View style={{ gap: 4 }}>
         <Text accessibilityRole="header" style={t.styles.text.heading}>{form?.title || words.rsvpTitle}</Text>
         {going}
+        {!!deadline && <Text style={t.styles.text.muted}>{deadline}</Text>}
         {!!notice && <Text style={t.styles.text.muted}>{notice}</Text>}
         {!!form?.intro && <Text style={t.styles.text.muted}>{form.intro}</Text>}
       </View>
@@ -260,9 +267,9 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
       {fields.map(field)}
       {error && (
         <View style={{ backgroundColor: t.colors.soft, borderRadius: Math.min(t.radius, 10), padding: 12, gap: 4 }}>
-          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{words.notSent}</Text>
+          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{rsvp.duplicate ? words.alreadyRsvped : words.notSent}</Text>
           <Text style={t.styles.text.muted}>
-            {isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
+            {rsvp.duplicate ? words.alreadyRsvpedNote : isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
           </Text>
         </View>
       )}

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

@@ -1,17 +1,18 @@
-import { Fragment, useEffect, useState } from 'react';
+import { Fragment, useEffect, useState, type ReactNode } from 'react';
 import { ActivityIndicator, Platform, Pressable, Switch, Text, TextInput, View, type KeyboardTypeOptions } from 'react-native';
 import * as Crypto from 'expo-crypto';
 import * as SecureStore from 'expo-secure-store';
 import { isAcmsError, type FormField } from '@acms-subir/client';
-import { Button, answerProblemText, answerProblems, countWords, fill, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
+import { Button, answerProblemText, answerProblems, countWords, fill, rsvpDeadlineText, seatChoices, useCancelBooking, useGuest, useLocale, useManagedBooking, useRsvp, useRsvpStatus, useSite, useStrings, useTheme } from '@acms-subir/native';
 
 // RSVP to one date of an event: <RsvpPanel slug={event.slug} start={occurrence.start} />,
 // with `start` exactly as useEvents returns it. Shows going and spots left,
 // seats, contact details and the event's questions, then the person's RSVP
 // with a way to cancel it; or why the date takes no RSVPs. Same rules as the
-// event's web page: open until the date ends, and the organiser may approve
-// each RSVP. useRsvp keeps one idempotency key per RSVP, so sending again
-// after a timeout can't register anyone twice. Its words come from
+// event's web page: open until the event's deadline or the date ends, one RSVP
+// per email and date, and the organiser may approve each RSVP. useRsvp keeps
+// one idempotency key per RSVP, so sending again after a timeout can't
+// register anyone twice. Its words come from
 // useStrings() in the app's language; the event's own form title, labels and
 // button win when the site has them.
 
@@ -37,7 +38,9 @@ const withOther = (f: FormField, value: string | string[] | undefined, other: st
 // a count in bold inside its words ("{count} going")
 const bold = (template: string, n: string) => template.split('{count}').map((part, i) => (i ? <Fragment key={i}><Text style={{ fontWeight: '700' }}>{n}</Text>{part}</Fragment> : part));
 
-export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
+// children: shown under the person's RSVP (not a declined one), e.g. an offer
+// to get notified if the date, time or place changes
+export function RsvpPanel({ slug, start, children }: { slug: string; start: string; children?: ReactNode }) {
   const t = useTheme();
   const words = useStrings();
   const { locale } = useLocale();
@@ -89,6 +92,8 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
   const errorText = [t.styles.text.small, { color: t.colors.ink, fontWeight: '600' as const }];
   const num = (n: number) => n.toLocaleString(locale);
   const seatsText = (n: number) => countWords(n, words.seat, words.seats, locale);
+  // "RSVPs close Fri, Oct 24 at 9 PM", or once past it "They closed on …"
+  const deadline = rsvpDeadlineText(s, words, locale);
   const going = (
     <Text style={t.styles.text.body}>
       {bold(s.going === 1 ? words.personGoing : words.peopleGoing, num(s.going))}
@@ -113,7 +118,7 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
     const who = mine?.booking.email ?? made!.email;
     const thanks = mine ? mine.confirmation : made!.formResponse?.definition.confirmation || null;
     const canCancel = !!stored && changes && (mine ? mine.can.cancel : false);
-    return (
+    return (<>
       <View style={[t.styles.card, { gap: 8 }]}>
         <Text accessibilityRole="header" style={t.styles.text.heading}>{!made ? words.yourRsvp : state === 'confirmed' ? words.confirmed : words.requestSent}</Text>
         <Text style={[t.styles.text.label, { color: t.colors.ink }]}>
@@ -136,14 +141,15 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
         {cancel.error && <Text style={errorText}>{isAcmsError(cancel.error) && cancel.error.status === 0 ? words.checkConnection : cancel.error.message}</Text>}
         {!canCancel && state !== 'declined' && <Text style={t.styles.text.small}>{words.changeByEmail}</Text>}
       </View>
-    );
+      {state !== 'declined' && children}
+    </>);
   }
 
   if (s.reason === 'disabled') return null;
   if (!s.open) return (
     <View style={[t.styles.card, { gap: 6 }]}>
       <Text accessibilityRole="header" style={t.styles.text.heading}>{s.reason === 'full' ? words.full : s.reason === 'cancelled' ? words.dateCancelled : words.rsvpClosed}</Text>
-      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : words.dateEnded}</Text>}
+      {s.reason === 'full' ? going : <Text style={t.styles.text.muted}>{s.reason === 'cancelled' ? words.noRsvpNeeded : s.reason === 'closed' ? deadline || words.rsvpClosed : words.dateEnded}</Text>}
     </View>
   );
 
@@ -239,6 +245,7 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
       <View style={{ gap: 4 }}>
         <Text accessibilityRole="header" style={t.styles.text.heading}>{form?.title || words.rsvpTitle}</Text>
         {going}
+        {!!deadline && <Text style={t.styles.text.muted}>{deadline}</Text>}
         {!!notice && <Text style={t.styles.text.muted}>{notice}</Text>}
         {!!form?.intro && <Text style={t.styles.text.muted}>{form.intro}</Text>}
       </View>
@@ -260,9 +267,9 @@ export function RsvpPanel({ slug, start }: { slug: string; start: string }) {
       {fields.map(field)}
       {error && (
         <View style={{ backgroundColor: t.colors.soft, borderRadius: Math.min(t.radius, 10), padding: 12, gap: 4 }}>
-          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{words.notSent}</Text>
+          <Text style={[t.styles.text.body, { fontWeight: '600' }]}>{rsvp.duplicate ? words.alreadyRsvped : words.notSent}</Text>
           <Text style={t.styles.text.muted}>
-            {isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
+            {rsvp.duplicate ? words.alreadyRsvpedNote : isAcmsError(error) && error.status === 0 ? words.offlineRetry : error.message}
           </Text>
         </View>
       )}

package/mobile-template/recipes/rsvp/recipe.json

@@ -10,6 +10,7 @@
   "next": [
     "Mount it on your event screen where the date is known: <RsvpPanel slug={occurrence.event.slug} start={occurrence.start} /> from '../../components/RsvpPanel', with start exactly as useEvents returns it (the UTC ISO string, e.g. pass o.start through router params), and only when occurrence.event.rsvp?.enabled",
     "The screen should scroll and avoid the keyboard: wrap it in <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined}> with <ScrollView keyboardShouldPersistTaps=\"handled\">",
-    "RSVPs need only the calendar (useSite().data.features.rsvp). Each RSVP's private manage token stays in expo-secure-store (never a URL or log): the panel shows the person's RSVP and lets them cancel it; the confirmation email's link works too"
+    "RSVPs need only the calendar (useSite().data.features.rsvp). Each RSVP's private manage token stays in expo-secure-store (never a URL or log): the panel shows the person's RSVP and lets them cancel it; the confirmation email's link works too",
+    "Anything you pass as children shows under the person's RSVP (not a declined one), e.g. an offer to get notified if the date, time or place changes: <RsvpPanel slug={…} start={…}><MyOffer /></RsvpPanel>. With push on, occurrence.event.notify.changes lists the topics that hear about changes ([] = none)"
   ]
 }

package/package.json

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

package/src/actions/index.ts

@@ -994,7 +994,8 @@ export const server = {
         cta: z.object({ label: z.string().max(120), href: z.string().max(1000), style: z.enum(['primary', 'outline']) }).optional(),
         calendarIds: z.array(z.string()).max(50).optional(),
         fields: z.record(z.string().max(2000)).optional(),
-        rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50), form: z.any().optional() }).optional(),
+        rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50),
+          closesAt: z.string().max(40).nullable().optional(), closeBefore: z.number().int().min(0).max(86400).optional(), form: z.any().optional() }).optional(),
         roomHold: z.object({ resourceIds: z.array(z.string()).max(50), span: z.enum(['event', 'day']), before: z.number().int().min(0).max(1440), after: z.number().int().min(0).max(1440), whileDraft: z.boolean(), keep: z.array(z.string()).max(500).default([]) }).optional(),
         scheduledAt: nullableTs.optional(),
       }),

package/src/components/EventPage.astro

@@ -2,15 +2,18 @@
 // The built-in event page (feature image, date block, place, button, add to
 // calendar, share, related events). Themes replace it with
 // templates/event.astro, which receives the same props. Every element
-// carries a stable .pc-ev-* class for CSS overrides.
+// carries a stable .pc-ev-* class for CSS overrides. Built-in words follow
+// the page's language (lib/calendar/event-words.ts, also in the theme SDK).
 import type { CalEvent, Calendar, Settings } from '../lib/schema';
 import { CALENDAR, eventIcsUrl, eventUrl, calendarPageUrl } from '../lib/calendar/config';
 import { addToCalendarLinks, eventTimeZone, formatOccurrence, safeColor, type Occurrence } from '../lib/calendar/events';
 import { describeRepeat } from '../lib/calendar/rrule';
 import { eventCardHtml, safeHref } from '../lib/calendar/cards';
 import { siteLang, siteLocale } from '../lib/dates';
-import { I18N, requestLocale } from '../lib/i18n';
-import { aroundCount, rsvpStrings } from '../lib/calendar/rsvp-words';
+import { I18N, localePath, requestLocale } from '../lib/i18n';
+import { aroundCount, deadlineParts, rsvpStrings } from '../lib/calendar/rsvp-words';
+import { eventStrings } from '../lib/calendar/event-words';
+import { fill } from '../lib/live/words';
 import { eventImage } from '../lib/calendar/images';
 import { directionsUrl, mapAttribution, MAP_HEIGHT, MAP_WIDTH } from '../lib/maps/service';
 
@@ -23,8 +26,10 @@ interface Props {
   upcoming: (Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'> & { cancelled?: boolean })[];
   origin: string;
   preview?: boolean;
-  // RSVP state when the event takes RSVPs (null otherwise)
-  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
+  // RSVP state when the event takes RSVPs (null otherwise). closesAt: this
+  // date's RSVP deadline (ms; null = open until it ends); duplicate: the
+  // address already has an RSVP for it (error then holds the same words)
+  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; closesAt?: number | null; duplicate?: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
 }
 const { event: e, occurrence: o, settings, calendars, html, upcoming, origin, preview = false, rsvp = null } = Astro.props;
 // the whole event, or just this date of a repeating one
@@ -33,12 +38,18 @@ const image = eventImage(e, settings);
 const tz = eventTimeZone(e, settings);
 const locale = siteLocale(settings);
 const f = formatOccurrence(o, tz, locale);
-const pageUrl = origin + eventUrl(e.slug);
+// the page's language, as the layout's: its built-in words, and links that
+// keep the visitor in it (/es/events/…)
+const reqLocale = I18N.enabled ? requestLocale(Astro.url, Astro.locals) : '';
+const lang = reqLocale || siteLang(settings);
+const ew = eventStrings(lang);
+const here = (path: string) => localePath(path, reqLocale);
+const pageUrl = origin + here(eventUrl(e.slug));
 const links = addToCalendarLinks(e, o, { pageUrl, icsUrl: eventIcsUrl(e.slug), tz });
 const repeats = describeRepeat(e.rrule, e.start, (ymd) => {
   const [y, m, d] = ymd.split('-').map(Number);
   return new Date(Date.UTC(y, m - 1, d)).toLocaleDateString(locale, { month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' });
-});
+}, lang);
 const ctaHref = safeHref(e.cta.href);
 const mapHref = e.location.url
   ? safeHref(e.location.url)
@@ -50,7 +61,9 @@ const loc = e.location;
 const showMap = loc.showMap !== false && Boolean(loc.mapImage) && typeof loc.lat === 'number' && typeof loc.lng === 'number';
 const directions = showMap ? safeHref(directionsUrl(loc)) : '';
 const mapCredit = showMap ? mapAttribution(loc.mapImage) : '';
-const mapLabel = loc.name || loc.address || 'the location';
+const place = loc.name || loc.address;
+const directionsLabel = place ? fill(ew.directionsTo, { place }) : ew.directionsHere;
+const mapAlt = place ? fill(ew.mapOf, { place }) : ew.mapHere;
 const fieldRows = CALENDAR.eventFields.filter((fd) => !fd.private && e.fields[fd.key]).map((fd) => ({ label: fd.label, value: e.fields[fd.key], type: fd.type }));
 const visibleTags = e.tags.filter((t) => !t.startsWith('#'));
 const I = {
@@ -63,10 +76,18 @@ const I = {
   video: 'M3 7h12v10H3zM15 10l6-3v10l-6-3',
 };
 const online = /zoom\.us|meet\.google|teams\.microsoft|webex|whereby|jit\.si/i.test(e.location.url);
-// the RSVP block speaks the page's language, as the layout does
-const w = rsvpStrings((I18N.enabled ? requestLocale(Astro.url, Astro.locals) : '') || siteLang(settings));
+// the RSVP block speaks the page's language too
+const w = rsvpStrings(lang);
 const going = rsvp ? aroundCount(rsvp.going, w.personGoing, w.peopleGoing) : ['', ''];
 const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.spotsLeft) : ['', ''];
+const taking = Boolean(rsvp?.open) && (rsvp!.left === null || rsvp!.left > 0);
+// "RSVPs close Fri, Oct 24 at 9 PM" while open; once past, "They closed on Fri, Oct 24."
+const deadline = typeof rsvp?.closesAt === 'number' ? deadlineParts(rsvp.closesAt, tz, locale) : null;
+const closesLine = deadline && taking ? fill(w.closesOn, deadline) : '';
+const closedLine = deadline && !rsvp!.open && !cancelled && rsvp!.closesAt! <= Date.now() ? fill(w.closedOn, deadline) : '';
+const dateCancelled = fill(ew.dateCancelled, { date: f.date });
+const showing = fill(ew.showing, { date: f.date });
+const moreCards = upcoming.map((u) => eventCardHtml(u, settings, { showImage: true, href: here(eventUrl(u.event.slug)) })).join('');
 ---
 
 <article class={`pc-ev-page${cancelled ? ' is-cancelled' : ''}`}>
@@ -79,19 +100,19 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
       {(calendars.length > 0 || visibleTags.length > 0) && (
         <div class="pc-ev-chips">
           {calendars.map((c) => (
-            <a class="pc-ev-chip" href={calendarPageUrl(c.slug)}><i style={`background:${safeColor(c.color)}`} aria-hidden="true" />{c.name}</a>
+            <a class="pc-ev-chip" href={here(calendarPageUrl(c.slug))}><i style={`background:${safeColor(c.color)}`} aria-hidden="true" />{c.name}</a>
           ))}
           {visibleTags.map((t) => <span class="pc-ev-chip is-tag">{t}</span>)}
         </div>
       )}
       <h1 class="pc-ev-title">{e.title}</h1>
-      {e.cancelled && <p class="pc-ev-cancelled"><b>This event is cancelled.</b> It stays listed so nobody is left wondering.</p>}
-      {!e.cancelled && cancelled && <p class="pc-ev-cancelled"><b>Cancelled on {f.date}.</b> Other dates go ahead as usual.</p>}
+      {e.cancelled && <p class="pc-ev-cancelled"><b>{ew.eventCancelled}</b> {ew.eventCancelledNote}</p>}
+      {!e.cancelled && cancelled && <p class="pc-ev-cancelled"><b>{dateCancelled}</b> {ew.dateCancelledNote}</p>}
       {e.excerpt && <p class="pc-ev-lede">{e.excerpt}</p>}
       <div class="pc-ev-body post-content" set:html={html} />
     </div>
 
-    <aside class="pc-ev-side" aria-label="Event details">
+    <aside class="pc-ev-side" aria-label={ew.details}>
       <div class="pc-ev-date">
         <span class="pc-ev-tile" aria-hidden="true"><b>{f.month}</b><span>{f.day}</span></span>
         <div>
@@ -107,7 +128,7 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
             {(e.location.address || mapHref) && (
               <span>
                 {e.location.address}
-                {mapHref && <>{e.location.address && ' · '}<a href={mapHref} target="_blank" rel="noopener">{online ? 'Join online' : 'Map'}</a></>}
+                {mapHref && <>{e.location.address && ' · '}<a href={mapHref} target="_blank" rel="noopener">{online ? ew.joinOnline : ew.map}</a></>}
               </span>
             )}
           </div>
@@ -115,9 +136,9 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
       )}
       {showMap && (
         <figure class="pc-ev-map">
-          <a href={directions || undefined} target="_blank" rel="noopener" aria-label={`Directions to ${mapLabel}`}>
-            <img class:list={['pc-ev-map-img', { 'is-light': Boolean(loc.mapImageDark) }]} src={loc.mapImage} alt={`Map of ${mapLabel}`} width={MAP_WIDTH} height={MAP_HEIGHT} loading="lazy" decoding="async" />
-            {loc.mapImageDark && <img class="pc-ev-map-img is-dark" src={loc.mapImageDark} alt={`Map of ${mapLabel}`} width={MAP_WIDTH} height={MAP_HEIGHT} loading="lazy" decoding="async" />}
+          <a href={directions || undefined} target="_blank" rel="noopener" aria-label={directionsLabel}>
+            <img class:list={['pc-ev-map-img', { 'is-light': Boolean(loc.mapImageDark) }]} src={loc.mapImage} alt={mapAlt} width={MAP_WIDTH} height={MAP_HEIGHT} loading="lazy" decoding="async" />
+            {loc.mapImageDark && <img class="pc-ev-map-img is-dark" src={loc.mapImageDark} alt={mapAlt} width={MAP_WIDTH} height={MAP_HEIGHT} loading="lazy" decoding="async" />}
           </a>
           {mapCredit && <figcaption class="pc-ev-map-credit">{mapCredit}</figcaption>}
         </figure>
@@ -125,7 +146,7 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
       {repeats && (
         <div class="pc-ev-fact">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={I.repeat} /></svg>
-          <div><b>{repeats}</b><span>Showing {f.date}</span></div>
+          <div><b>{repeats}</b><span>{showing}</span></div>
         </div>
       )}
       {fieldRows.map((r) => (
@@ -137,14 +158,15 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
       {rsvp ? (
         <div class="pc-ev-rsvp">
           <p class="pc-ev-going">{going[0]}<b>{rsvp.going}</b>{going[1]}{rsvp.left !== null && <> · {left[0]}<b>{rsvp.left}</b>{left[1]}</>}</p>
-          {rsvp.open && (rsvp.left === null || rsvp.left > 0) ? (
+          {closesLine && <p class="pc-ev-closes">{closesLine}</p>}
+          {taking ? (
             <details class="pc-ev-rsvpform" open={Boolean(rsvp.error)}>
               <summary class="pc-ev-cta">{w.saveSeat}</summary>
               <form method="post">
                 <Fragment set:html={rsvp.formHtml ?? ''}/>
                 {e.rsvp.form?.title && <h3>{e.rsvp.form.title}</h3>}
                 {e.rsvp.form?.intro && <p>{e.rsvp.form.intro}</p>}
-                {rsvp.error && <p class="pc-bk-error">{rsvp.error}</p>}
+                {rsvp.duplicate ? <p class="pc-ev-notice" role="status"><b>{w.duplicate}</b> {w.duplicateNote}</p> : rsvp.error && <p class="pc-bk-error">{rsvp.error}</p>}
                 <label class="pc-bk-field"><span>{w.nameField}</span><input name="name" required maxlength="120" autocomplete="name" value={rsvp.values?.name} /></label>
                 <label class="pc-bk-field"><span>{w.emailField}</span><input name="email" type="email" required maxlength="200" autocomplete="email" value={rsvp.values?.email} /></label>
                 {rsvp.maxSeats > 1 && (
@@ -157,6 +179,7 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
               </form>
             </details>
           ) : <p class="pc-ev-full">{rsvp.open ? w.full : w.closed}</p>}
+          {closedLine && <p class="pc-ev-closes">{closedLine}</p>}
         </div>
       ) : e.cta.label && ctaHref && !cancelled && (
         <a class={`pc-ev-cta${e.cta.style === 'outline' ? ' is-outline' : ''}`} href={ctaHref}>{e.cta.label}</a>
@@ -164,33 +187,33 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
       <details class="pc-ev-add">
         <summary>
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={I.cal} /></svg>
-          Add to calendar
+          {ew.addToCalendar}
         </summary>
         <div class="pc-ev-add-menu">
           <a href={links.google} target="_blank" rel="noopener">Google Calendar</a>
           <a href={links.ics}>Apple Calendar</a>
           <a href={links.outlook} target="_blank" rel="noopener">Outlook</a>
-          <a href={links.ics} download={`${e.slug}.ics`}>Download .ics</a>
+          <a href={links.ics} download={`${e.slug}.ics`}>{ew.downloadIcs}</a>
         </div>
       </details>
-      <button type="button" class="pc-ev-share" data-url={pageUrl} data-title={e.title}>
+      <button type="button" class="pc-ev-share" data-url={pageUrl} data-title={e.title} data-share={ew.share} data-copied={ew.linkCopied}>
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={I.share} /></svg>
-        <span>Share</span>
+        <span>{ew.share}</span>
       </button>
     </aside>
   </div>
 
   {upcoming.length > 0 && (
     <section class="pc-ev-more">
-      <h2>More events</h2>
-      <div class="pc-ev-cards" data-layout="grid" set:html={upcoming.map((u) => eventCardHtml(u, settings, { showImage: true })).join('')} />
-      <a class="pc-ev-all" href={CALENDAR.base}>See the full calendar →</a>
+      <h2>{ew.moreEvents}</h2>
+      <div class="pc-ev-cards" data-layout="grid" set:html={moreCards} />
+      <a class="pc-ev-all" href={here(CALENDAR.base)}>{ew.fullCalendar}</a>
     </section>
   )}
 </article>
 
 <script>
-  // share sheet where available, else copy the link
+  // share sheet where available, else copy the link (words from the page's language)
   document.querySelectorAll<HTMLButtonElement>('.pc-ev-share').forEach((b) => b.addEventListener('click', async () => {
     const url = b.dataset.url ?? location.href;
     if (navigator.share) {
@@ -198,7 +221,7 @@ const left = rsvp && rsvp.left !== null ? aroundCount(rsvp.left, w.spotLeft, w.s
     }
     await navigator.clipboard.writeText(url);
     const label = b.querySelector('span');
-    if (label) { label.textContent = 'Link copied'; setTimeout(() => (label.textContent = 'Share'), 1400); }
+    if (label) { label.textContent = b.dataset.copied ?? 'Link copied'; setTimeout(() => (label.textContent = b.dataset.share ?? 'Share'), 1400); }
   }));
   // one open menu; outside click closes
   document.addEventListener('click', (ev) => {