@acms-subir/core 0.3.53 → 0.3.55

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>