@acms-subir/core 0.3.53 → 0.3.54

package/src/lib/repo/types.ts

@@ -10,6 +10,7 @@ import type { EmailStore } from '../email/store';
 import type { RsvpStaffNotice } from '../email/types';
 import type { PushStore } from '../push/store';
 import type { AnnouncementStore } from '../announcements/store';
+import type { RequestStore } from '../calendar/request-store';
 import type { Announcement } from '../announcements/types';
 import type { EditorStore } from '../editor/store';
 import type { PermissionStore } from '../permissions/store';
@@ -19,7 +20,7 @@ export type ImportRecordKind = 'post' | 'page' | 'user' | 'tag' | 'media' | 'red
 export interface ImportRecord { runId: string; kind: ImportRecordKind; sourceId: string; acmsId: string; action: 'created' | 'updated'; stamp: number }
 export interface DesignVersion { id: string; createdAt: number; author: string; summary: string; snapshot: Record<string, unknown> }
 
-import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance, Calendar, CalEvent, ApiKey, ApiScope, Webhook, WebhookDelivery, Resource, BookingLink, Booking, BookingStatus, Place, EventLocation, EventRequest } from '../schema';
+import type { Page, Post, Link, Media, NavItem, Redirect, Settings, Snippet, Tag, User, Role, WidgetInstance, Calendar, CalEvent, ApiKey, ApiScope, Webhook, WebhookDelivery, Resource, BookingLink, Booking, BookingStatus, Place, EventLocation, EventRequest, RequestRecord } from '../schema';
 
 export interface Stats {
   publishedPages: number;
@@ -82,6 +83,8 @@ export interface ContentRepository {
   readonly live: LiveStore;
   readonly push: PushStore;
   readonly announcements: AnnouncementStore;
+  // calendar requests on their own rows (lib/calendar/request-store.ts)
+  readonly requests: RequestStore;
   readonly editor: EditorStore;
   readonly permissions: PermissionStore;
   readonly screens: ScreenStore;
@@ -372,6 +375,8 @@ export interface ContentRepository {
     // saved TV screens, without their keys (each gets a new one); a backup
     // without them leaves the current ones
     screens?: Screen[];
+    // added with calendar requests; a backup without them leaves the current ones
+    eventRequests?: RequestRecord[];
   }, authRecovery?: { issuer: string; subject: string; userId: string }): Promise<void>;
 
   // imports (lib/import/apply.ts drives these). writeImported is the

package/src/lib/schema.ts

@@ -395,6 +395,53 @@ export const EventRequest = z.object({
 });
 export type EventRequest = z.infer<typeof EventRequest>;
 
+// A request about the calendar kept on its own row (table event_requests,
+// lib/calendar/request-store.ts), unlike the member requests above that
+// stage an event draft:
+// - 'new': a new event from anyone, without an account (source 'app' or 'web').
+//   Approving makes a draft event and stores its id in `eventId`.
+// - 'change': anyone asks for a change to an event (`eventId`, one date in
+//   `key` or '' for the whole event); `note` says what should change.
+// - 'move' / 'from-date': a host's move of one date, or a change from a date
+//   on (C3/C4); `data` holds the move.
+// `userId` is the member who asked; `requester` is the person without an
+// account (never both). `note` is their own words to staff, `reply` staff's
+// last answer. Decided rows (and withdrawn ones, which set reviewedAt too)
+// are deleted some days after `reviewedAt` (CalendarSettings.requests).
+export const RequestKind = z.enum(['new', 'change', 'move', 'from-date']);
+export type RequestKind = z.infer<typeof RequestKind>;
+export const RequestState = z.enum(['pending', 'approved', 'declined', 'withdrawn']);
+export type RequestState = z.infer<typeof RequestState>;
+export const RequestSource = z.enum(['member', 'web', 'app']);
+export type RequestSource = z.infer<typeof RequestSource>;
+export const Requester = z.object({
+  name: z.string(),
+  email: z.string(),
+  phone: z.string().default(''),
+  // the language they asked in, for replies ('' = the main language)
+  locale: z.string().default(''),
+});
+export type Requester = z.infer<typeof Requester>;
+export const RequestRecord = z.object({
+  id: z.string(),
+  kind: RequestKind,
+  state: RequestState.default('pending'),
+  source: RequestSource,
+  userId: z.string().default(''),
+  requester: Requester.nullable().default(null),
+  eventId: z.string().default(''),
+  // an occurrence key (same format as exdates) when it's about one date
+  key: z.string().default(''),
+  data: z.record(z.any()).default({}),
+  note: z.string().default(''),
+  reply: z.string().default(''),
+  reviewedBy: z.string().default(''),
+  reviewedAt: z.number().default(0),
+  createdAt: z.number(),
+  updatedAt: z.number(),
+});
+export type RequestRecord = z.infer<typeof RequestRecord>;
+
 export const CalEvent = z.object({
   id: z.string(),
   slug: z.string(),

package/src/pages/admin/calendar/events/index.astro

@@ -22,6 +22,7 @@ import { invalidateRedirectCache } from '../../../../middleware';
 import { accessFor, forbiddenUnless } from '../../../../lib/permissions/access';
 import type { Permission } from '../../../../lib/permissions/catalog';
 import { approveEventRequest, declineEventRequest, pendingRequests } from '../../../../lib/calendar/requests';
+import { approveDateRequest, dateRequestClashes, dateRequestTimes, declineDateRequest, type MoveRequestData } from '../../../../lib/calendar/host-requests';
 import { mergeEventDraft } from '../../../../lib/drafts';
 import { ApiError } from '../../../../lib/api';
 
@@ -72,7 +73,7 @@ if (Astro.request.method === 'POST') {
   // create, copy and import make drafts; bulk status changes that touch live events need Publish
   let needs: Permission = 'content.edit';
   // answering members' event requests needs Publish (approving puts them live)
-  if (op === 'approve' || op === 'decline') needs = 'content.publish';
+  if (op === 'approve' || op === 'decline' || op === 'approve-date' || op === 'decline-date') needs = 'content.publish';
   if (op === 'bulk') {
     const to = String(form.get('to'));
     const before = await Promise.all(form.getAll('ids').map(String).filter(Boolean).map((id) => repo.getEvent(id)));
@@ -81,7 +82,7 @@ if (Astro.request.method === 'POST') {
   const denied = await forbiddenUnless(Astro.request, Astro.cookies, repo, needs);
   if (denied) return denied;
 
-  if (op === 'approve' || op === 'decline') {
+  if (op === 'approve' || op === 'decline' || op === 'approve-date' || op === 'decline-date') {
     const access = (await accessFor(Astro.request, Astro.cookies, repo))!;
     const who = { id: access.userId, can: (p: string) => access.can(p as Permission) };
     const hooks = { url: Astro.url, locals: Astro.locals };
@@ -93,6 +94,17 @@ if (Astro.request.method === 'POST') {
       return Astro.redirect(`/admin/calendar/events?${p}`);
     };
     try {
+      // a host's date move (host-requests.ts): `id` is the request's
+      if (op === 'approve-date') {
+        const { moved } = await approveDateRequest(repo, who, id, hooks, Number(form.get('at')) || undefined);
+        const n = moved.clashes.length;
+        const shared = n ? ', and it shares a room with ' + n + ' other booking' + (n === 1 ? '' : 's') + ' at that time' : '';
+        return toRequests('Approved. “' + moved.event.title + '” has the date moved' + shared + '.');
+      }
+      if (op === 'decline-date') {
+        await declineDateRequest(repo, who, id, String(form.get('reply') || ''), hooks, Number(form.get('at')) || undefined);
+        return toRequests('Declined. The date stays as it was.');
+      }
       const before = await repo.getEvent(id);
       if (op === 'approve') {
         const e = await approveEventRequest(repo, who, id, hooks, Number(form.get('at')) || undefined);
@@ -182,8 +194,9 @@ if (Astro.request.method === 'POST') {
   }
 }
 
-const [events, calendars, requests, users, access] = await Promise.all([
+const [events, calendars, requests, users, access, waitingDates] = await Promise.all([
   repo.listEvents(), repo.listCalendars(), pendingRequests(repo), repo.listUsers(), accessFor(Astro.request, Astro.cookies, repo),
+  repo.requests.list({ kinds: ['move', 'from-date'], states: ['pending'], order: 'oldest', limit: -1 }),
 ]);
 const canApprove = access?.can('content.publish') ?? false;
 const calById = new Map(calendars.map((c) => [c.id, c]));
@@ -201,7 +214,7 @@ const counts = {
   upcoming: rows.filter(isUpcoming).length,
   past: rows.filter((r) => !isUpcoming(r)).length,
   drafts: rows.filter((r) => r.e.status === 'draft').length,
-  requests: requests.length,
+  requests: requests.length + waitingDates.length,
   all: rows.length,
 };
 const selected = rows
@@ -278,6 +291,26 @@ const requestRows = scope !== 'requests' ? [] : requests
     };
   });
 
+// hosts' date moves waiting (scope=requests): what moves where, and what
+// else holds its rooms then (C2 clashes; names are fine for staff)
+const eventById = new Map(events.map((e) => [e.id, e]));
+const roomNames = new Map((await repo.listResources()).map((r) => [r.id, r.name]));
+const dateRows = scope !== 'requests' ? [] : await Promise.all(waitingDates
+  .filter((r) => eventById.has(r.eventId))
+  .filter((r) => { const e = eventById.get(r.eventId)!; return (!calFilter || e.calendarIds.includes(calFilter)) && (!q || `${e.title} ${e.slug}`.toLowerCase().includes(q)); })
+  .map(async (r) => {
+    const e = eventById.get(r.eventId)!;
+    const d = r.data as MoveRequestData;
+    const host = nameOf.get(r.userId) ?? 'a host';
+    const clashes = await dateRequestClashes(repo, r);
+    const clash = clashes.length ? `${[...new Set(clashes.map((c) => roomNames.get(c.resourceId) ?? 'A room'))].join(', ')} also held then by ${[...new Set(clashes.map((c) => c.title || 'something else'))].slice(0, 3).join(', ')}` : '';
+    return {
+      id: r.id, href: `/admin/calendar/events/${e.id}`, title: e.title || 'Untitled event', at: r.updatedAt, host,
+      ...(await dateRequestTimes(repo, r)), back: Boolean(d.back),
+      line: `${d.back ? 'Move back' : 'Date move'} from ${host} · ${ago(r.createdAt)}`, note: r.note, publicNote: d.note, clash,
+    };
+  }));
+
 // feed calendars: the next 60 days as read-only rows (upcoming/all scopes)
 const feedErrors: string[] = [];
 if ((scope === 'upcoming' || scope === 'all') && feedCals.length) {
@@ -464,8 +497,51 @@ const subBits = [
               ))}
             </section>
           )}
-          {requestRows.length > 0 && !canApprove && <p class="hint">Someone whose role can publish content approves these.</p>}
-          {requestRows.length === 0 && (
+          {dateRows.length > 0 && (
+            <section class="card bk-group">
+              <div class="bk-dayh"><b>Date changes from hosts</b><span>{dateRows.length}</span></div>
+              {dateRows.map((r) => (
+                <div class="bk-row ev-req">
+                  <a class="bk-when" href={r.href}>{r.from || 'No date'}<small>{r.to ? '→ ' + r.to : ''}</small></a>
+                  <a class="bk-who" href={r.href}>
+                    <b>{r.title}</b>
+                    <small>{r.line}</small>
+                    {r.note && <small class="ev-req-note">“{r.note}”</small>}
+                    {r.publicNote && <small>Note on the date: {r.publicNote}</small>}
+                    {r.clash && <small class="ev-req-clash">{r.clash}</small>}
+                  </a>
+                  <span class="bk-st is-pending">{r.back ? 'Move back' : 'Date move'}</span>
+                  <div class="bk-acts">
+                    <a class="btn sm ghost" href={r.href}>Open</a>
+                    {canApprove && (
+                      <>
+                        <button class="btn sm ghost" type="button" data-modal={`decline-date-${r.id}`}>Decline…</button>
+                        <form method="post">
+                          <input type="hidden" name="op" value="approve-date" /><input type="hidden" name="id" value={r.id} /><input type="hidden" name="at" value={r.at} />
+                          <button class="btn sm" type="submit">Approve</button>
+                        </form>
+                      </>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </section>
+          )}
+          {(requestRows.length > 0 || dateRows.length > 0) && !canApprove && <p class="hint">Someone whose role can publish content approves these.</p>}
+          {canApprove && dateRows.map((r) => (
+            <Modal id={`decline-date-${r.id}`} title="Decline this date change">
+              <form method="post">
+                <input type="hidden" name="op" value="decline-date" /><input type="hidden" name="id" value={r.id} /><input type="hidden" name="at" value={r.at} />
+                <p class="hint">The date stays as it is, and {r.host} hears that it wasn’t approved.</p>
+                <label class="field"><span>Note to {r.host} <em class="hint">optional</em></span><textarea name="reply" rows="3" maxlength="1000" placeholder="That room is booked for the youth night. Could the week after work?"></textarea></label>
+                <div class="modal-foot">
+                  <button class="btn ghost" type="button" data-close>Cancel</button>
+                  <button class="btn primary" type="submit">Decline</button>
+                </div>
+              </form>
+            </Modal>
+          ))}
+          {requestRows.length === 0 && dateRows.length === 0 && (
             <p class="hint ev-req-empty">{counts.requests ? 'No requests match the current filters.' : 'Nothing waiting. When members ask for events or suggest changes, they show up here.'}</p>
           )}
           {canApprove && requestRows.map((r) => (

package/src/pages/admin/index.astro

@@ -29,9 +29,13 @@ const access = await accessFor(Astro.request, Astro.cookies, repo);
 const eventRequests = CALENDAR.enabled && access?.can('content.publish') ? await pendingRequests(repo) : [];
 const newRequests = eventRequests.filter((e) => e.request?.kind === 'new').length;
 const changeRequests = eventRequests.length - newRequests;
+// hosts' date moves waiting (lib/calendar/host-requests.ts)
+const dateRequests = CALENDAR.enabled && access?.can('content.publish') ? await repo.requests.count({ kinds: ['move', 'from-date'], states: ['pending'] }) : 0;
+const waitingRequests = eventRequests.length + dateRequests;
 const requestDetail = [
   newRequests ? `${newRequests} new event${newRequests === 1 ? '' : 's'}` : '',
   changeRequests ? `changes to ${changeRequests} event${changeRequests === 1 ? '' : 's'}` : '',
+  dateRequests ? `${dateRequests} date change${dateRequests === 1 ? '' : 's'}` : '',
 ].filter(Boolean).join(' · ');
 const me = sessionUserId && sessionUserId !== OWNER_ENV ? users.find((u) => u.id === sessionUserId) : null;
 const firstName = me?.name.split(/\s+/)[0] ?? '';
@@ -167,10 +171,10 @@ const tiles = [
       </div>
     )}
 
-    {eventRequests.length > 0 && (
+    {waitingRequests > 0 && (
       <div class="notice">
         <div class="grow-text">
-          <b>{eventRequests.length} event request{eventRequests.length === 1 ? '' : 's'} waiting</b>
+          <b>{waitingRequests} event request{waitingRequests === 1 ? '' : 's'} waiting</b>
           <span class="hint">{requestDetail}</span>
         </div>
         <a class="btn sm" href="/admin/calendar/events?scope=requests">Review</a>

package/src/pages/members/_EventForm.astro

@@ -1,9 +1,12 @@
 ---
 import type { EventFieldConfig } from '../../lib/calendar/config';
 import { MEMBER_FORM_LIMITS as L, repeatChoices, type MemberEventForm } from '../../lib/calendar/member-form';
+import { memberStrings, type MemberStrings } from '../../lib/calendar/member-words';
+import { fill } from '../../lib/live/words';
 
 // The event request form (new requests and suggested changes). Plain HTML:
-// it posts to the page it's on, with `op` saying what to do.
+// it posts to the page it's on, with `op` saying what to do. `w` and `lang`
+// word it in the page's language.
 interface Props {
   values: MemberEventForm;
   /** the calendars members may choose (native, public); none hides the choice */
@@ -13,9 +16,12 @@ interface Props {
   op: 'submit' | 'update';
   submitLabel: string;
   error?: string;
+  w?: MemberStrings;
+  lang?: string;
 }
-const { values: v, calendars, fields, op, submitLabel, error = '' } = Astro.props;
-const repeat = repeatChoices(v.repeat, v.date);
+const { values: v, calendars, fields, op, submitLabel, error = '', w = memberStrings('en'), lang } = Astro.props;
+const f = w.form;
+const repeat = repeatChoices(v.repeat, v.date, lang);
 const fieldType = (t: EventFieldConfig['type']) => (t === 'number' ? 'number' : t === 'url' ? 'url' : 'text');
 ---
 
@@ -23,25 +29,25 @@ const fieldType = (t: EventFieldConfig['type']) => (t === 'number' ? 'number' :
   {error && <p class="pc-bk-error" role="alert">{error}</p>}
   <input type="hidden" name="op" value={op} />
   <label class="pc-bk-field">
-    <span>Title</span>
+    <span>{f.title}</span>
     <input name="title" required maxlength={L.title} value={v.title} />
   </label>
   <fieldset class="pc-mem-when">
-    <legend>When</legend>
+    <legend>{f.when}</legend>
     <div class="pc-mem-row">
-      <label class="pc-bk-field"><span>Date</span><input type="date" name="date" required value={v.date} /></label>
-      <label class="pc-bk-field pc-mem-time"><span>Starts</span><input type="time" name="startTime" value={v.startTime} /></label>
-      <label class="pc-bk-field pc-mem-time"><span>Ends <em>(optional)</em></span><input type="time" name="endTime" value={v.endTime} /></label>
+      <label class="pc-bk-field"><span>{f.date}</span><input type="date" name="date" required value={v.date} /></label>
+      <label class="pc-bk-field pc-mem-time"><span>{f.starts}</span><input type="time" name="startTime" value={v.startTime} /></label>
+      <label class="pc-bk-field pc-mem-time"><span>{f.ends} <em>{f.optional}</em></span><input type="time" name="endTime" value={v.endTime} /></label>
     </div>
-    <label class="pc-bk-check"><input type="checkbox" name="allDay" value="1" checked={v.allDay} /> <span>All day <small>No start or end time</small></span></label>
+    <label class="pc-bk-check"><input type="checkbox" name="allDay" value="1" checked={v.allDay} /> <span>{f.allDay} <small>{f.allDayHint}</small></span></label>
     {v.days > 0 && (
       <>
         <input type="hidden" name="days" value={String(v.days)} />
-        <p class="pc-mem-hint">This event runs over {v.days + 1} days. Changing the date moves all of them.</p>
+        <p class="pc-mem-hint">{fill(f.multiDay, { days: String(v.days + 1) })}</p>
       </>
     )}
     <label class="pc-bk-field">
-      <span>Repeats</span>
+      <span>{f.repeats}</span>
       <select name="repeat">
         {repeat.options.map((o) => <option value={o.value} selected={o.value === repeat.value}>{o.label}</option>)}
       </select>
@@ -49,40 +55,40 @@ const fieldType = (t: EventFieldConfig['type']) => (t === 'number' ? 'number' :
     </label>
   </fieldset>
   <label class="pc-bk-field">
-    <span>Where</span>
-    <input name="where" maxlength={L.where} value={v.where} placeholder="A room, an address, or “Online”" />
+    <span>{f.where}</span>
+    <input name="where" maxlength={L.where} value={v.where} placeholder={f.wherePlaceholder} />
   </label>
   <label class="pc-bk-field">
-    <span>Description</span>
+    <span>{f.description}</span>
     <textarea name="description" rows="6" maxlength={L.description}>{v.description}</textarea>
-    <small>Plain text. Leave a blank line between paragraphs.</small>
+    <small>{f.descriptionHint}</small>
   </label>
   {calendars.length > 0 && (
     <label class="pc-bk-field">
-      <span>Calendar</span>
+      <span>{f.calendar}</span>
       <select name="calendarId">
-        <option value="">Not sure (the team will choose)</option>
+        <option value="">{f.notSure}</option>
         {calendars.map((c) => <option value={c.id} selected={c.id === v.calendarId}>{c.name}</option>)}
       </select>
     </label>
   )}
-  {fields.map((f) => (
+  {fields.map((fd) => (
     <label class="pc-bk-field">
-      <span>{f.label}</span>
-      {f.type === 'textarea' ? (
-        <textarea name={`field_${f.key}`} rows="3" maxlength={L.field}>{v.fields[f.key] ?? ''}</textarea>
-      ) : f.type === 'select' ? (
-        <select name={`field_${f.key}`}>
-          <option value="">Choose…</option>
-          {f.options.map((o) => <option value={o} selected={o === v.fields[f.key]}>{o}</option>)}
+      <span>{fd.label}</span>
+      {fd.type === 'textarea' ? (
+        <textarea name={`field_${fd.key}`} rows="3" maxlength={L.field}>{v.fields[fd.key] ?? ''}</textarea>
+      ) : fd.type === 'select' ? (
+        <select name={`field_${fd.key}`}>
+          <option value="">{f.choose}</option>
+          {fd.options.map((o) => <option value={o} selected={o === v.fields[fd.key]}>{o}</option>)}
         </select>
       ) : (
-        <input type={fieldType(f.type)} name={`field_${f.key}`} maxlength={f.type === 'number' ? undefined : L.field} step={f.type === 'number' ? 'any' : undefined} value={v.fields[f.key] ?? ''} />
+        <input type={fieldType(fd.type)} name={`field_${fd.key}`} maxlength={fd.type === 'number' ? undefined : L.field} step={fd.type === 'number' ? 'any' : undefined} value={v.fields[fd.key] ?? ''} />
       )}
     </label>
   ))}
   <label class="pc-bk-field">
-    <span>Note for the team <em>(only staff see this)</em></span>
+    <span>{f.note} <em>{f.staffOnly}</em></span>
     <textarea name="note" rows="3" maxlength={L.note}>{v.note}</textarea>
   </label>
   <button class="pc-bk-submit" type="submit">{submitLabel}</button>

package/src/pages/members/_Layout.astro

@@ -1,23 +1,27 @@
 ---
 import Site from '../../layouts/Site.astro';
+import { fill } from '../../lib/live/words';
+import { memberStrings, type MemberStrings } from '../../lib/calendar/member-words';
 
 // The frame of the built-in member pages: the site's own layout and theme,
 // never indexed, plus who's signed in. `.pc-mem-*` classes are theme hooks;
-// form controls reuse the booking pages' `.pc-bk-*` ones.
+// form controls reuse the booking pages' `.pc-bk-*` ones. `w`: the page's
+// words (memberLanguage in _http.ts), English by default.
 interface Props {
   title: string;
   user: { name: string; email: string; staff: boolean };
+  w?: MemberStrings;
 }
-const { title, user } = Astro.props;
+const { title, user, w = memberStrings('en') } = Astro.props;
 ---
 
 <Site title={title} noindex staffPreview>
   <div class="pc-mem">
     <div class="pc-mem-top">
-      <span>Signed in as {user.name || user.email}</span>
+      <span>{fill(w.signedInAs, { name: user.name || user.email })}</span>
       <span class="pc-mem-top-links">
-        {user.staff && <a href="/admin">Open the admin</a>}
-        <form method="post" action="/admin/logout"><button type="submit">Sign out</button></form>
+        {user.staff && <a href="/admin">{w.openAdmin}</a>}
+        <form method="post" action="/admin/logout"><button type="submit">{w.signOut}</button></form>
       </span>
     </div>
     <slot />
@@ -48,6 +52,7 @@ const { title, user } = Astro.props;
     .pc-mem-state::before { content: ''; width: 7px; height: 7px; border-radius: 2px; background: currentColor; }
     .pc-mem-state.is-pending { color: var(--warning); }
     .pc-mem-state.is-declined { color: var(--danger); }
+    .pc-mem-state.is-approved { color: var(--success); }
     .pc-mem-reply { margin: 10px 0 0; padding: 9px 12px; background: var(--soft); border-radius: var(--r-sm); font-size: 14px; white-space: pre-line; }
     .pc-mem > .pc-mem-reply { margin: 0; }
     .pc-mem-actions { display: flex; flex-wrap: wrap; gap: 8px; margin-top: 12px; }
@@ -73,5 +78,20 @@ const { title, user } = Astro.props;
     .pc-mem-row { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 12px; }
     .pc-mem-when:has(input[name='allDay']:checked) .pc-mem-time { opacity: 0.45; }
     .pc-mem-hint { color: var(--muted); font-size: 13px; margin: 0; }
+    /* one date's controls on its row (Move…, then Cancel); an open form takes the line under it */
+    .pc-mem-dates li { flex-wrap: wrap; justify-content: flex-start; column-gap: 6px; }
+    .pc-mem-dates li > span:first-child { flex: 1 1 16rem; }
+    .pc-mem-date-acts { display: inline-flex; flex-wrap: wrap; gap: 6px; align-items: center; order: 3; }
+    .pc-mem-dates em.is-pending { color: var(--warning); font-weight: 500; }
+    .pc-mem-move { order: 2; }
+    .pc-mem-move[open], .pc-mem-clash { order: 4; flex-basis: 100%; }
+    .pc-mem-move > summary { list-style: none; cursor: pointer; display: inline-flex; }
+    .pc-mem-move > summary::-webkit-details-marker { display: none; }
+    .pc-mem-move[open] > summary { margin-bottom: 8px; }
+    .pc-mem-move form { display: grid; gap: 12px; padding: 12px; background: var(--soft); border-radius: var(--r-sm); margin-bottom: 6px; }
+    .pc-mem-move fieldset { border: 0; margin: 0; padding: 0; min-width: 0; display: flex; flex-wrap: wrap; gap: 6px 14px; }
+    .pc-mem-move fieldset > legend { padding: 0; margin-bottom: 6px; font-size: 13px; font-weight: 600; }
+    .pc-mem-clash { display: grid; gap: 10px; padding: 12px 14px; border: 1px solid color-mix(in srgb, var(--warning) 40%, var(--line)); border-radius: var(--r-sm); background: var(--panel); }
+    .pc-mem-clash p { margin: 0; font-size: 14px; }
   }
 </style>

package/src/pages/members/_http.ts

@@ -1,4 +1,10 @@
 import { ApiError } from '../../lib/api';
+import type { AstroGlobal } from 'astro';
+import type { Settings } from '../../lib/schema';
+import { I18N, localePath, requestLocale } from '../../lib/i18n';
+import { isExtraLocale } from '../../lib/translations';
+import { siteLang, siteLocale } from '../../lib/dates';
+import { memberError, memberStrings, type MemberStrings } from '../../lib/calendar/member-words';
 
 // Shared by the built-in "My events" pages: they're personal, so nothing
 // they answer (redirects included) may be cached or indexed.
@@ -12,14 +18,31 @@ export function keepPrivate(headers: Headers) {
 /** 303 after a POST (the browser GETs the list), 302 otherwise */
 export const redirectTo = (location: string, status = 303) => new Response(null, { status, headers: { Location: location, ...NO_STORE } });
 
-/** signed out: sign in, then come back here */
-export const signInRedirect = (url: URL) => redirectTo(`/admin/login?return=${encodeURIComponent(url.pathname + url.search)}`, 302);
+/** signed out: sign in, then come back here (the address they used: /es/… is rewritten to these pages) */
+export const signInRedirect = (url: URL, locals?: unknown) => {
+  const path = (locals as { acmsPath?: string } | undefined)?.acmsPath ?? url.pathname;
+  return redirectTo(`/admin/login?return=${encodeURIComponent(path + url.search)}`, 302);
+};
+
+/**
+ * The page's language (/es/members/events is these pages in Spanish): its
+ * words, links that keep the visitor in it, and the locale dates are written
+ * in (the site's own locale setting for the main language).
+ */
+export function memberLanguage(Astro: Pick<AstroGlobal, 'url' | 'locals'>, settings: Pick<Settings, 'locale'>): { locale: string; lang: string; w: MemberStrings; here: (path: string) => string; dateLocale: string } {
+  const locale = I18N.enabled ? requestLocale(Astro.url, Astro.locals) : '';
+  const lang = locale || siteLang(settings);
+  return { locale, lang, w: memberStrings(lang), here: (path: string) => localePath(path, locale), dateLocale: isExtraLocale(locale) ? locale : siteLocale(settings) };
+}
 
 export const notFound = () => new Response(null, { status: 404, statusText: 'Not found', headers: NO_STORE });
 
-/** an error from requests.ts → a message safe to show, and the status to answer with */
-export function failure(err: unknown): { message: string; status: number } {
-  if (err instanceof ApiError) return { message: err.message, status: err.status };
+/** an error from requests.ts (or moves.ts) → a message safe to show, in the page's words when given, and the status to answer with */
+export function failure(err: unknown, w?: MemberStrings, lang?: string): { message: string; status: number; code: string } {
+  if (err instanceof ApiError) {
+    const code = String((err as { code?: unknown }).code ?? '');
+    return { message: w ? memberError(w, err, lang) : err.message, status: err.status, code };
+  }
   console.error(err);
-  return { message: 'Something went wrong. Please try again.', status: 500 };
+  return { message: w?.somethingWrong ?? 'Something went wrong. Please try again.', status: 500, code: '' };
 }

package/src/pages/members/events/[id].astro

@@ -3,22 +3,24 @@ import Layout from '../_Layout.astro';
 import EventForm from '../_EventForm.astro';
 import { getRepo } from '../../../lib/repo';
 import { currentUser } from '../../../server';
-import { ApiError } from '../../../lib/api';
+import { coded } from '../../../lib/api';
 import { readForm } from '../../../lib/forms/http';
 import { MEMBERS, memberEventsPath, bodyToText, isHost, updateEventRequest, withdrawEventRequest } from '../../../lib/calendar/requests';
 import { eventFormValues, eventRequestInput, memberEventFields, readEventForm } from '../../../lib/calendar/member-form';
 import { mergeEventDraft } from '../../../lib/drafts';
-import { failure, keepPrivate, notFound, redirectTo, signInRedirect } from '../_http';
+import { failure, keepPrivate, memberLanguage, notFound, redirectTo, signInRedirect } from '../_http';
+import { fill } from '../../../lib/live/words';
 
 // Edit a request, or suggest changes to a live event the member hosts: the
 // form starts from the event with any changes already waiting merged in.
 // A live event stays as it is until the team approves (updateEventRequest).
 if (!MEMBERS.enabled) return notFound();
 const user = await currentUser(Astro);
-if (!user) return signInRedirect(Astro.url);
+if (!user) return signInRedirect(Astro.url, Astro.locals);
 keepPrivate(Astro.response.headers);
 const repo = await getRepo(Astro.locals);
-const home = memberEventsPath();
+const { w, lang, here } = memberLanguage(Astro, await repo.getSettings());
+const home = here(memberEventsPath());
 const hooks = { url: Astro.url, locals: Astro.locals };
 const id = Astro.params.id ?? '';
 const event = await repo.getEvent(id);
@@ -40,12 +42,12 @@ if (Astro.request.method === 'POST') {
       await withdrawEventRequest(repo, user, id, hooks);
       return redirectTo(`${home}?withdrawn=1`);
     }
-    if (op !== 'update') throw new ApiError(400, 'That action isn’t available here.');
+    if (op !== 'update') throw coded(400, 'unavailable', 'That action isn’t available here.');
     values = readEventForm(form, fields);
     await updateEventRequest(repo, user, id, eventRequestInput(values), hooks);
     return redirectTo(`${home}?${live ? 'changes' : 'updated'}=1`);
   } catch (err) {
-    const f = failure(err);
+    const f = failure(err, w, lang);
     error = f.message;
     Astro.response.status = f.status;
   }
@@ -53,34 +55,33 @@ if (Astro.request.method === 'POST') {
 
 const r = event.request;
 const canRequest = user.can('events.request');
-const heading = live ? 'Suggest changes' : 'Edit your request';
-const lede = live
-  ? `“${event.title}” stays as it is on the site until the team approves your changes.`
-  : r?.state === 'declined' ? 'Make your changes and send it again.'
-  : r ? 'It’s waiting for approval. Saving sends the updated request.'
-  : 'It isn’t on the calendar yet. Send it to the team when it’s ready.';
+const heading = live ? w.suggestTitle : w.editTitle;
+const lede = live ? fill(w.suggestLede, { title: event.title })
+  : r?.state === 'declined' ? w.declinedLede
+  : r ? w.waitingLede
+  : w.draftLede;
 const waiting = live && r?.kind === 'changes' && r.state === 'pending';
 const reply = r?.state === 'declined' ? r.reply : '';
 const canWithdraw = canRequest && r && !(r.kind === 'changes' && r.state === 'declined');
 ---
 
-<Layout title={heading} user={user}>
+<Layout title={heading} user={user} w={w}>
   <div>
-    <a class="pc-mem-back" href={home}>← My events</a>
+    <a class="pc-mem-back" href={home}>{w.back}</a>
     <div class="pc-mem-head"><h1>{heading}</h1></div>
     <p class="pc-mem-lede">{lede}</p>
   </div>
-  {waiting && <p class="pc-mem-reply">The changes you sent are waiting for approval; they’re filled in below. Sending again replaces them.</p>}
+  {waiting && <p class="pc-mem-reply">{w.changesWaitingNote}</p>}
   {r?.state === 'declined' && (
-    <p class="pc-mem-reply"><strong>{r.kind === 'changes' ? 'The team declined your last changes.' : 'The team declined this request.'}</strong>{reply && <> They said: {reply}</>}</p>
+    <p class="pc-mem-reply"><strong>{r.kind === 'changes' ? w.declinedChanges : w.declinedRequest}</strong>{reply && <> {w.theySaid} {reply}</>}</p>
   )}
   {canRequest
-    ? <EventForm values={values} calendars={calendars} fields={fields} op="update" submitLabel={live ? 'Send changes for approval' : 'Submit for approval'} error={error} />
-    : <p class="pc-bk-error" role="alert">Your role doesn’t include “Request events”. Ask the site’s team if you need it.</p>}
+    ? <EventForm values={values} calendars={calendars} fields={fields} op="update" submitLabel={live ? w.sendChanges : w.submit} error={error} w={w} lang={lang} />
+    : <p class="pc-bk-error" role="alert">{w.noRequestRole}</p>}
   {canWithdraw && (
-    <form method="post" onsubmit={r!.kind === 'new' ? "return confirm('Withdraw this request?')" : "return confirm('Withdraw these changes?')"}>
+    <form method="post" onsubmit={'return confirm(' + JSON.stringify(r!.kind === 'new' ? w.confirmWithdrawRequest : w.confirmWithdrawChanges) + ')'}>
       <input type="hidden" name="op" value="withdraw" />
-      <button class="pc-mem-btn is-danger" type="submit">{r!.kind === 'new' ? 'Withdraw request' : 'Withdraw changes'}</button>
+      <button class="pc-mem-btn is-danger" type="submit">{r!.kind === 'new' ? w.withdrawRequest : w.withdrawChanges}</button>
     </form>
   )}
 </Layout>