@acms-subir/core 0.3.34 → 0.3.36

package/src/layouts/Site.astro

@@ -12,6 +12,8 @@ import { announcementPath, localizeAnnouncement } from '../lib/announcements/ser
 import { announcementStrings } from '../lib/announcements/words';
 import { SEARCH } from '../lib/search-config';
 import { searchStrings } from '../lib/search-i18n';
+import { siteStrings } from '../lib/site-words';
+import { liveStrings } from '../lib/live/words';
 import { effectiveSettings, effectiveNav, resolvePreview } from '../lib/designPreview';
 import { diffDesign } from '../lib/designDiff';
 import { getTheme } from '../lib/theme';
@@ -71,10 +73,19 @@ const compareUrl = (live: boolean) => {
 const daysLeft = preview.expiresAt ? Math.max(1, Math.ceil((preview.expiresAt - Date.now()) / 86_400_000)) : 0;
 const versionDate = preview.versionAt ? new Date(preview.versionAt).toLocaleDateString('en-US', { month: 'short', day: 'numeric' }) : '';
 const design = resolveDesign(settings);
+// the path the visitor sees (/es/… is rewritten to the shared route by the middleware)
+const current = (Astro.locals as { acmsPath?: string }).acmsPath ?? Astro.url.pathname;
+// with i18n configured, the request path decides the document language; the
+// locale setting (a date-formatting concern) stays the fallback
+const reqLocale = I18N.enabled ? requestLocale(new URL(current, Astro.url), Astro.locals) : '';
+const htmlLang = reqLocale || siteLang(settings);
+// built-in words (skip link, menus, footer columns, legal links) follow it too
+const words = siteStrings(htmlLang);
+const liveWords = liveStrings(htmlLang);
 const navPages = pages.filter((p) => p.status === 'published' && !p.isHome);
 const headerNav = navItems.filter((n) => n.area === 'header');
 const footerNav = navItems.filter((n) => n.area === 'footer').map(n => ({ label: n.label, url: n.url }));
-if (LEGAL.enabled) for (const [url, label] of [['/privacy', 'Privacy'], ['/terms', 'Terms']]) {
+if (LEGAL.enabled) for (const [url, label] of [['/privacy', words.privacy], ['/terms', words.terms]]) {
   if (!footerNav.some(n => n.url.replace(/\/$/, '') === url)) footerNav.push({ url, label });
 }
 const socialNav = navItems.filter((n) => n.area === 'social').map((n) => {
@@ -90,17 +101,15 @@ const isCurrent = (url: string) =>
 const headerLinks: { label: string; url: string }[] = headerNav.length > 0
   ? headerNav.map((n) => ({ label: n.label, url: n.url }))
   : [
-      { label: 'Home', url: '/' },
+      { label: words.home, url: '/' },
       ...navPages.map((p) => ({ label: p.title, url: `/${p.slug}` })),
       ...Object.values(CONTENT.collections).map((c) => ({ label: c.plural, url: c.base })),
-      { label: 'Links', url: '/links' },
+      { label: words.links, url: '/links' },
     ];
 const tokens = design.tokens;
 // the visitor scheme toggle only exists when the theme follows the OS
 const schemeToggle = tokens.scheme === 'auto';
 
-// the path the visitor sees (/es/… is rewritten to the shared route by the middleware)
-const current = (Astro.locals as { acmsPath?: string }).acmsPath ?? Astro.url.pathname;
 const fullTitle = exactTitle && title ? title : title ? `${title} · ${settings.siteTitle}` : settings.siteTitle;
 // the columns footer already shows the tagline beside the brand, so its
 // default bottom line is just the copyright
@@ -122,14 +131,10 @@ const annKey = showAnnouncement
   : '';
 const canonical = origin + canonicalPath(current);
 const metaDescription = description || settings.tagline || undefined;
-// with i18n configured, the request path decides the document language; the
-// locale setting (a date-formatting concern) stays the fallback
-const reqLocale = I18N.enabled ? requestLocale(new URL(current, Astro.url), Astro.locals) : '';
 // same page, other language; internal links stay in the visitor's language
 const barePath = stripLocale(current);
 const inLang = reqLocale && reqLocale !== I18N.defaultLocale ? reqLocale : '';
 const lnk = (url: string) => (inLang && /^\/(?!\/|media\/|rss\.xml|sitemap|admin|api|_)/.test(url) ? localePath(url, inLang) : url);
-const htmlLang = reqLocale || siteLang(settings);
 // pinned announcements (Admin → Announcements) take the bar's place while
 // they're up, urgent first; each one is closed on its own (remembered per id)
 const annWords = announcementStrings(htmlLang);
@@ -152,7 +157,7 @@ const searchAction = reqLocale && reqLocale !== I18N.defaultLocale ? `/${reqLoca
 // theme asks for it (footer: simple).
 const readLinks = [
   ...Object.values(CONTENT.collections).map((c) => ({ label: c.plural, url: c.base })),
-  ...(SEARCH.enabled ? [{ label: 'Search', url: searchAction }] : []),
+  ...(SEARCH.enabled ? [{ label: searchT.label, url: searchAction }] : []),
   { label: 'RSS', url: '/rss.xml' },
 ];
 // a theme's templates/header.astro / footer.astro get this instead of core markup
@@ -174,6 +179,7 @@ const chrome: SiteChrome = {
   schemeToggle,
   liveHeader: Boolean(liveSignals?.header),
   headerStyle: String(tokens.header), footerStyle: String(tokens.footer),
+  lang: htmlLang, words,
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const HeaderTpl = design.theme.HeaderTemplate as any;
@@ -259,10 +265,10 @@ const homeJsonLd =
   <body>
     {liveSignals?.bar && (
       <div class="pc-live-bar" data-live-bar hidden role="status">
-        <span class="pc-live-mark">Live now</span>
+        <span class="pc-live-mark">{liveWords.bar}</span>
         <span class="pc-live-bar-title" data-live-bar-title></span>
-        <a data-live-bar-watch href="#">Watch →</a>
-        <button type="button" class="pc-live-x" aria-label="Dismiss live notice">✕</button>
+        <a data-live-bar-watch href="#">{liveWords.watch}</a>
+        <button type="button" class="pc-live-x" aria-label={liveWords.dismissBar}>✕</button>
       </div>
     )}
     {pinnedBars.map((b) => (
@@ -297,7 +303,7 @@ const homeJsonLd =
       <div class="announcement-bar" data-ann-key={ann.dismissible ? annKey : undefined} hidden={ann.dismissible || undefined}>
         {annLink ? <a href={annLink}>{ann.text}</a> : <span>{ann.text}</span>}
         {ann.dismissible && (
-          <button type="button" class="announcement-x" aria-label="Dismiss announcement">✕</button>
+          <button type="button" class="announcement-x" aria-label={annWords.dismiss}>✕</button>
         )}
       </div>
     )}
@@ -317,7 +323,7 @@ const homeJsonLd =
         })();
       </script>
     )}
-    {!bare && <a class="skip-link" href="#main">Skip to content</a>}
+    {!bare && <a class="skip-link" href="#main">{words.skip}</a>}
     {!bare && HeaderTpl && <HeaderTpl site={chrome} />}
     {!bare && !HeaderTpl && (
       <header class="site-header" data-style={tokens.header}>
@@ -325,7 +331,7 @@ const homeJsonLd =
           <a class="brand" href={reqLocale ? localeHomeUrl(reqLocale) : '/'}>
             <SiteLogo title={settings.siteTitle} logo={settings.siteLogo} logoDark={settings.siteLogoDark} />
           </a>
-          <nav class="site-nav" aria-label="Main">
+          <nav class="site-nav" aria-label={words.main}>
             {headerLinks.map((n) => (
               <a
                 href={lnk(n.url)}
@@ -336,7 +342,7 @@ const homeJsonLd =
             ))}
           </nav>
           <div class="site-tools">
-            {liveSignals?.header && <a class="site-live" data-live-header href="#" hidden>Live</a>}
+            {liveSignals?.header && <a class="site-live" data-live-header href="#" hidden>{liveWords.marker}</a>}
             {showSearch && (
               <a class="pc-search-trigger" href={searchAction} data-search-open aria-label={searchT.label}>
                 <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" aria-hidden="true"><circle cx="11" cy="11" r="7" /><path d="m20 20-3.6-3.6" /></svg>
@@ -345,7 +351,7 @@ const homeJsonLd =
               </a>
             )}
             {I18N.enabled && (
-              <span class="lang-switch" role="group" aria-label="Language">
+              <span class="lang-switch" role="group" aria-label={words.language}>
                 {I18N.locales.map((l) => (
                   <a
                     href={localePath(barePath, l)}
@@ -357,12 +363,12 @@ const homeJsonLd =
               </span>
             )}
             {schemeToggle && (
-              <button type="button" class="icon-btn scheme-toggle" data-scheme-toggle aria-label="Toggle dark mode">
+              <button type="button" class="icon-btn scheme-toggle" data-scheme-toggle aria-label={words.scheme}>
                 <svg class="i-moon" width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 14.5A8 8 0 1 1 9.5 4a6.5 6.5 0 0 0 10.5 10.5Z" /></svg>
                 <svg class="i-sun" width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" aria-hidden="true"><circle cx="12" cy="12" r="4" /><path d="M12 2.5v2M12 19.5v2M4.6 4.6l1.4 1.4M18 18l1.4 1.4M2.5 12h2M19.5 12h2M4.6 19.4 6 18M18 6l1.4-1.4" /></svg>
               </button>
             )}
-            <button type="button" class="icon-btn menu-btn" data-menu-open aria-label="Open menu" aria-haspopup="dialog">
+            <button type="button" class="icon-btn menu-btn" data-menu-open aria-label={words.openMenu} aria-haspopup="dialog">
               <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" aria-hidden="true"><path d="M4 8h16M4 16h16" /></svg>
             </button>
           </div>
@@ -370,9 +376,9 @@ const homeJsonLd =
       </header>
     )}
     {!bare && (
-      <dialog class="site-menu" aria-label="Menu">
+      <dialog class="site-menu" aria-label={words.menu}>
         <div class="site-menu-grab" aria-hidden="true"></div>
-        <nav aria-label="Main">
+        <nav aria-label={words.main}>
           {headerLinks.map((n) => (
             <a
               href={lnk(n.url)}
@@ -384,7 +390,7 @@ const homeJsonLd =
         </nav>
         <div class="site-menu-foot">
           {I18N.enabled ? (
-            <span class="lang-switch" role="group" aria-label="Language">
+            <span class="lang-switch" role="group" aria-label={words.language}>
               {I18N.locales.map((l) => (
                 <a href={localePath(barePath, l)} lang={l} class:list={[{ on: l === (reqLocale || I18N.defaultLocale) }]}>{l.toUpperCase()}</a>
               ))}
@@ -392,12 +398,12 @@ const homeJsonLd =
           ) : <span />}
           <span class="site-menu-actions">
             {schemeToggle && (
-              <button type="button" class="icon-btn scheme-toggle" data-scheme-toggle aria-label="Toggle dark mode">
+              <button type="button" class="icon-btn scheme-toggle" data-scheme-toggle aria-label={words.scheme}>
                 <svg class="i-moon" width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 14.5A8 8 0 1 1 9.5 4a6.5 6.5 0 0 0 10.5 10.5Z" /></svg>
                 <svg class="i-sun" width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" aria-hidden="true"><circle cx="12" cy="12" r="4" /><path d="M12 2.5v2M12 19.5v2M4.6 4.6l1.4 1.4M18 18l1.4 1.4M2.5 12h2M19.5 12h2M4.6 19.4 6 18M18 6l1.4-1.4" /></svg>
               </button>
             )}
-            <button type="button" class="icon-btn" data-menu-close aria-label="Close menu">
+            <button type="button" class="icon-btn" data-menu-close aria-label={words.closeMenu}>
               <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" aria-hidden="true"><path d="M6 6l12 12M18 6 6 18" /></svg>
             </button>
           </span>
@@ -405,7 +411,7 @@ const homeJsonLd =
       </dialog>
     )}
     {!bare && (
-      <script is:inline>
+      <script is:inline define:vars={{ copyLabel: words.copy, copiedLabel: words.copied, closeLabel: words.close }}>
         (() => {
           // phone menu: a bottom sheet on <dialog> (focus trap + Esc for free)
           const menu = document.querySelector('dialog.site-menu');
@@ -428,13 +434,13 @@ const homeJsonLd =
             const b = document.createElement('button');
             b.type = 'button';
             b.className = 'code-copy';
-            b.textContent = 'Copy';
+            b.textContent = copyLabel;
             b.addEventListener('click', async () => {
               try {
                 await navigator.clipboard.writeText((pre.querySelector('code') || pre).innerText);
-                b.textContent = 'Copied';
+                b.textContent = copiedLabel;
                 b.classList.add('is-done');
-                setTimeout(() => { b.textContent = 'Copy'; b.classList.remove('is-done'); }, 1400);
+                setTimeout(() => { b.textContent = copyLabel; b.classList.remove('is-done'); }, 1400);
               } catch {}
             });
             pre.append(b);
@@ -448,7 +454,8 @@ const homeJsonLd =
               if (!box) {
                 box = document.createElement('dialog');
                 box.className = 'pc-lightbox';
-                box.innerHTML = '<img alt=""><button type="button" aria-label="Close">\u2715</button>';
+                box.innerHTML = '<img alt=""><button type="button">\u2715</button>';
+                box.querySelector('button').setAttribute('aria-label', closeLabel);
                 box.addEventListener('click', () => box.close());
                 document.body.append(box);
               }
@@ -727,7 +734,7 @@ const homeJsonLd =
                 <a class="brand" href="/"><SiteLogo title={settings.siteTitle} logo={settings.siteLogo} logoDark={settings.siteLogoDark} /></a>
                 {settings.tagline && <p class="footer-blurb">{settings.tagline}</p>}
                 {socialNav.length > 0 && (
-                  <nav class="social-nav" aria-label="Social">
+                  <nav class="social-nav" aria-label={words.social}>
                     {socialNav.map((n) => (
                       <a href={lnk(n.url)} class:list={[{ 'has-icon': n.icon }]} aria-label={n.icon ? n.label : undefined} title={n.icon ? n.label : undefined} target={isExternal(n.url) ? '_blank' : undefined} rel={isExternal(n.url) ? 'noopener me' : undefined}>
                         {n.icon ? <Fragment set:html={n.icon} /> : n.label}
@@ -736,13 +743,13 @@ const homeJsonLd =
                   </nav>
                 )}
               </div>
-              <nav class="footer-col" aria-label="Read">
-                <h2>Read</h2>
+              <nav class="footer-col" aria-label={words.read}>
+                <h2>{words.read}</h2>
                 {readLinks.map((n) => <a href={lnk(n.url)}>{n.label}</a>)}
               </nav>
               {footerNav.length > 0 && (
-                <nav class="footer-col" aria-label="Site">
-                  <h2>Site</h2>
+                <nav class="footer-col" aria-label={words.site}>
+                  <h2>{words.site}</h2>
                   {footerNav.map((n) => (
                     <a href={lnk(n.url)} target={isExternal(n.url) ? '_blank' : undefined} rel={isExternal(n.url) ? 'noopener' : undefined}>{n.label}</a>
                   ))}
@@ -759,7 +766,7 @@ const homeJsonLd =
                 </nav>
               )}
               {socialNav.length > 0 && (
-                <nav class="social-nav" aria-label="Social">
+                <nav class="social-nav" aria-label={words.social}>
                   {socialNav.map((n) => (
                     <a href={lnk(n.url)} class:list={[{ 'has-icon': n.icon }]} aria-label={n.icon ? n.label : undefined} target={isExternal(n.url) ? '_blank' : undefined} rel={isExternal(n.url) ? 'noopener me' : undefined}>
                       {n.icon ? <Fragment set:html={n.icon} /> : n.label}
@@ -777,9 +784,9 @@ const homeJsonLd =
       <div class="pc-live-dock" data-live-dock hidden>
         <a href="#">
           <span class="pc-live-dock-thumb"><img alt="" decoding="async" hidden /></span>
-          <span><span class="pc-live-mark">Live</span><b data-live-dock-title></b></span>
+          <span><span class="pc-live-mark">{liveWords.marker}</span><b data-live-dock-title></b></span>
         </a>
-        <button type="button" class="pc-live-x" aria-label="Dismiss live player">✕</button>
+        <button type="button" class="pc-live-x" aria-label={liveWords.dismissDock}>✕</button>
       </div>
     )}
     <script>

package/src/lib/announcements/api.ts

@@ -8,14 +8,14 @@ import { siteOrigin } from '../seo';
 import { pageQuery, queryParams } from '../mobile/http';
 import { localeOnlyQuery, localeQuery, mobileLocale } from '../mobile/locale';
 import { PUSH } from '../push/config';
-import { deviceLocale, knownTopics, pushTopics, siteOriginOf } from '../push/service';
+import { deviceLocale, knownTopics, pushTopics, siteOriginOf, sitePath } from '../push/service';
 import { linkTargets } from '../push/api';
 import { ANNOUNCEMENTS } from './config';
 import { announcementJson, isLive, publishAnnouncement, type PublishOptions } from './service';
 import { announcementStrings } from './words';
 import { ANNOUNCEMENT_KINDS, AnnouncementInput, AnnouncementKind, LIMITS, type Announcement, type AnnouncementWords } from './types';
 
-const DAY = 86_400_000;
+const HOUR = 3_600_000, DAY = 24 * HOUR;
 export function requireAnnouncements() {
   if (!ANNOUNCEMENTS.enabled) throw new ApiError(404, 'Announcements are off on this site.');
 }
@@ -70,18 +70,20 @@ export function defaultAudience(known: Set<string>): Record<AnnouncementKind, st
 export async function adminAnnouncementsState(repo: ContentRepository, url: URL) {
   const now = Date.now();
   const settings = await repo.getSettings();
-  const [announcements, topics, known, stats, links, sentThisWeek] = await Promise.all([
+  const [announcements, topics, known, stats, links, sentThisWeek, changes] = await Promise.all([
     repo.announcements.list(),
     PUSH.enabled ? pushTopics(repo) : Promise.resolve([]),
     PUSH.enabled ? knownTopics(repo) : Promise.resolve(new Set<string>()),
     PUSH.enabled ? repo.push.stats(now) : Promise.resolve(null),
     linkTargets(repo),
     PUSH.enabled ? repo.push.countSent(['manual', 'announcement'], now - 7 * DAY) : Promise.resolve(0),
+    PUSH.enabled ? repo.push.sentSince('change', now - 2 * HOUR) : Promise.resolve([]),
   ]);
   const main = I18N.enabled ? I18N.defaultLocale : (settings.locale || 'en');
+  const origin = siteOriginOf(settings, url.origin);
   return {
     now,
-    site: { name: settings.siteTitle, icon: settings.siteFavicon, origin: siteOriginOf(settings, url.origin), timezone: settings.timezone || 'UTC' },
+    site: { name: settings.siteTitle, icon: settings.siteFavicon, origin, timezone: settings.timezone || 'UTC' },
     languages: { main: { code: main, name: localeName(main) }, extra: extraLanguages().map((code) => ({ code, name: localeName(code) })) },
     kinds: ANNOUNCEMENT_KINDS.map((id) => ({ id, label: announcementStrings('en').kinds[id] })),
     limits: LIMITS,
@@ -98,6 +100,8 @@ export async function adminAnnouncementsState(repo: ContentRepository, url: URL)
     // the push audience each kind starts with in the composer (['*'] = everyone)
     defaultAudience: defaultAudience(known),
     links,
+    // automatic event-change notices of the last 2 hours: a push whose button opens the same event repeats one
+    recentChanges: changes.map((n) => ({ path: sitePath(n.url, origin), at: n.createdAt, title: n.title })).filter((c) => c.path),
     announcements,
   };
 }

package/src/lib/announcements/store.ts

@@ -68,6 +68,10 @@ export class AnnouncementStore {
   async due(now: number, limit = 10): Promise<Announcement[]> {
     return (await this.all(`SELECT * FROM announcements WHERE status='scheduled' AND COALESCE(publish_at,0)<=? ORDER BY publish_at LIMIT ?`, [now, limit])).map(announcement);
   }
+  /** Ones that went up with a push since `since` (an event-change notice about the same event is skipped). */
+  async pushedSince(since: number): Promise<Announcement[]> {
+    return (await this.all(`SELECT * FROM announcements WHERE notification_id IS NOT NULL AND published_at>=? ORDER BY published_at DESC LIMIT 50`, [since])).map(announcement);
+  }
   /** Published ones past their end: they come down. */
   async endExpired(now: number): Promise<number> {
     return (await this.all(`UPDATE announcements SET status='ended', updated_at=? WHERE status='published' AND show_until IS NOT NULL AND show_until<=? RETURNING id`, [now, now])).length;

package/src/lib/cache/policy.ts

@@ -31,8 +31,8 @@ function privatePrefixes() {
     ...(CALENDAR.enabled ? [CALENDAR.bookBase] : []),
   ];
 }
-// Public app API routes that are personal, transactional or write-only.
-const PRIVATE_API = /^\/api\/v1\/(?:admin|auth|guest|bookings|availability|devices|push|forms)(?:\/|$)/;
+// Public app API routes that are personal, transactional, live or write-only.
+const PRIVATE_API = /^\/api\/v1\/(?:admin|auth|guest|bookings|availability|devices|push|forms|events\/[^/]+\/rsvp)(?:\/|$)/;
 
 const under = (path: string, prefix: string) => path === prefix || path.startsWith(`${prefix}/`) || path.startsWith(`${prefix}.`);
 

package/src/lib/calendar/hooks.ts

@@ -1,10 +1,12 @@
 // Side effects when an event changes live: a 301 when a published event's
-// slug moves, and the matching webhook (event.published / event.updated /
+// slug moves, a queued "event changed" app notice when its schedule or place
+// moves, and the matching webhook (event.published / event.updated /
 // event.unpublished). Shared by the editor actions, the list's bulk actions
 // and the agent tools so every path behaves the same.
 import type { ContentRepository } from '../repo/types';
 import type { CalEvent } from '../schema';
 import { emitWebhook } from '../webhooks';
+import { queueEventChange } from '../push/service';
 import { eventToJson } from './api';
 import { eventUrl } from './config';
 
@@ -18,6 +20,8 @@ export async function eventChanged(
     await repo.createRedirect({ fromPath: eventUrl(before.slug), toPath: eventUrl(after.slug) }).catch(() => {});
     opts.onRedirect?.();
   }
+  // the scheduler sends it once the edits settle, if the rule still applies
+  await queueEventChange(repo, before, after).catch((e) => console.error('acms push: event change not queued', e));
   let type: 'event.published' | 'event.updated' | 'event.unpublished' | null = null;
   if (before.status !== 'published' && after.status === 'published') type = 'event.published';
   else if (before.status === 'published' && after.status !== 'published') type = 'event.unpublished';

package/src/lib/legal/app-privacy.ts

@@ -10,15 +10,17 @@ export interface AppPrivacyAnswers { rows: StoreRow[]; tracking: string; notes:
 
 export function appPrivacyAnswers(f: LegalFacts, privacyUrl: string): AppPrivacyAnswers {
   const rows: StoreRow[] = [];
-  const contact = [...(f.bookings ? ['bookings'] : []), ...(f.appForms ? ['forms'] : [])];
+  // apps can RSVP wherever the calendar is on; room bookings need bookings too
+  const contact = [...(f.bookings ? ['bookings'] : []), ...(f.calendar ? ['RSVPs'] : []), ...(f.appForms ? ['forms'] : [])];
+  const sends = contact.length > 1 ? `${contact.slice(0, -1).join(', ')} or ${contact.at(-1)}` : contact[0];
   if (contact.length) {
     rows.push({
-      data: 'Name, email address, phone number', when: `When someone sends ${contact.join(' or ')} from the app`,
+      data: 'Name, email address, phone number', when: `When someone sends ${sends} from the app`,
       apple: 'Contact Info → Name, Email Address, Phone Number. Purpose: App Functionality. Linked to the user. Not used for tracking.',
       google: 'Personal info → Name, Email address, Phone number. Collected, not shared. Purpose: App functionality. Optional (people choose to send it).',
     });
     rows.push({
-      data: 'Answers typed into a form or booking question', when: `When someone sends ${contact.join(' or ')} from the app`,
+      data: 'Answers typed into a form or booking question', when: `When someone sends ${sends} from the app`,
       apple: 'User Content → Other User Content. Purpose: App Functionality. Linked to the user. Not used for tracking.',
       google: 'App activity → Other user-generated content. Collected, not shared. Purpose: App functionality. Optional.',
     });

package/src/lib/legal/text-en.ts

@@ -82,6 +82,7 @@ export function privacyEn(f: LegalFacts, country: string): PolicySection[] {
     ...(app ? [f.announcements
       ? 'Our app may keep the content it last loaded on your phone so it works offline, and remembers there your notification choice and which announcements you’ve read or closed. That stays on your phone and is never sent to us.'
       : 'Our app may keep the content it last loaded on your phone so it works offline, and remembers your notification choice there.'] : []),
+    ...(app && f.calendar ? ['When you RSVP or book in the app, it keeps the private key that lets you see or cancel it in your phone’s secure storage, like the private link we email you.'] : []),
   ] });
   s.push({ id: 'sharing', title: 'Who receives your information', text: [
     `We don’t sell your personal information${pixels ? '' : ' or share it for advertising'}. These service providers process it on our behalf and only for the purposes above: ${list(processors(f))}. They must protect it at least as this notice describes. Some of them may store it outside your country, including in the United States.`,

package/src/lib/legal/text-es.ts

@@ -83,6 +83,7 @@ export function privacyEs(f: LegalFacts, country: string): PolicySection[] {
     ...(app ? [f.announcements
       ? 'Nuestra app puede guardar en su teléfono el contenido que cargó por última vez para funcionar sin conexión, y recuerda ahí su preferencia de notificaciones y qué anuncios leyó o cerró. Eso se queda en su teléfono y nunca se nos envía.'
       : 'Nuestra app puede guardar en su teléfono el contenido que cargó por última vez para funcionar sin conexión, y recuerda ahí su preferencia de notificaciones.'] : []),
+    ...(app && f.calendar ? ['Cuando confirma su asistencia o reserva en la app, esta guarda en el almacenamiento seguro de su teléfono la clave privada que le permite verla o cancelarla, igual que el enlace privado que le enviamos por correo.'] : []),
   ] });
   s.push({ id: 'sharing', title: 'Quién recibe sus datos', text: [
     `No vendemos sus datos personales${pixels ? '' : ' ni los compartimos con fines publicitarios'}. Estos proveedores los tratan por cuenta nuestra y solo para los fines descritos: ${list(processors(f))}. Deben protegerlos al menos como lo describe este aviso. Algunos pueden guardarlos fuera de su país, incluido Estados Unidos.`,

package/src/lib/live/view.ts

@@ -1,8 +1,9 @@
 import type { PublicLiveSnapshot } from './types';
+import { fill, liveStrings, type LiveStrings } from './words';
 
 // Display text for a live snapshot. Pure and DOM-free: LiveCard renders it on
 // the server and the browser re-applies it on every status change, so both
-// always agree.
+// always agree. Both pass the page's words and language (English by default).
 
 export const PROVIDER_NAMES: Record<string, string> = { youtube: 'YouTube', twitch: 'Twitch', facebook: 'Facebook', other: '' };
 
@@ -23,6 +24,7 @@ export interface LiveView {
 }
 
 const MIN = 60_000, HOUR = 60 * MIN, DAY = 24 * HOUR;
+const EN = liveStrings('en');
 
 export function compactCount(n: number): string {
   if (n < 1000) return String(n);
@@ -30,49 +32,51 @@ export function compactCount(n: number): string {
   return `${v < 10 ? Math.floor(v * 10) / 10 : Math.floor(v)}${unit}`;
 }
 
-export function ago(ms: number): string {
-  if (ms < MIN) return 'just now';
-  if (ms < HOUR) return `${Math.floor(ms / MIN)} min ago`;
+export function ago(ms: number, w: LiveStrings = EN): string {
+  if (ms < MIN) return w.justNow;
+  if (ms < HOUR) return fill(w.ago, { time: `${Math.floor(ms / MIN)} min` });
   const h = Math.floor(ms / HOUR), m = Math.floor((ms % HOUR) / MIN);
-  return m ? `${h} h ${m} min ago` : `${h} h ago`;
+  return fill(w.ago, { time: m ? `${h} h ${m} min` : `${h} h` });
 }
 
-export function until(ms: number): string {
-  if (ms < MIN) return 'starting now';
-  if (ms < HOUR) return `in ${Math.ceil(ms / MIN)} min`;
-  if (ms < DAY) return `in ${Math.round(ms / HOUR)} h`;
+export function until(ms: number, w: LiveStrings = EN): string {
+  if (ms < MIN) return w.startingNow;
+  if (ms < HOUR) return fill(w.in, { time: `${Math.ceil(ms / MIN)} min` });
+  if (ms < DAY) return fill(w.in, { time: `${Math.round(ms / HOUR)} h` });
   const d = Math.round(ms / DAY);
-  return `in ${d} day${d === 1 ? '' : 's'}`;
+  return fill(w.in, { time: fill(d === 1 ? w.day : w.days, { n: String(d) }) });
 }
 
-export function when(ts: number, now: number): string {
-  const d = new Date(ts);
-  const time = d.toLocaleTimeString(undefined, { hour: 'numeric', minute: '2-digit' });
-  if (ts - now < 6 * DAY) return `${d.toLocaleDateString(undefined, { weekday: 'short' })} ${time}`;
-  return `${d.toLocaleDateString(undefined, { month: 'short', day: 'numeric' })} ${time}`;
+// a bad language tag formats like the runtime default rather than failing the page
+export function when(ts: number, now: number, locale?: string): string {
+  const format = (o: Intl.DateTimeFormatOptions) => {
+    try { return new Intl.DateTimeFormat(locale, o).format(ts); } catch { return new Intl.DateTimeFormat(undefined, o).format(ts); }
+  };
+  const time = format({ hour: 'numeric', minute: '2-digit' });
+  return `${format(ts - now < 6 * DAY ? { weekday: 'short' } : { month: 'short', day: 'numeric' })} ${time}`;
 }
 
-export function liveView(s: PublicLiveSnapshot | null, now: number): LiveView | null {
+export function liveView(s: PublicLiveSnapshot | null, now: number, w: LiveStrings = EN, locale?: string): LiveView | null {
   if (!s || (s.status !== 'live' && s.status !== 'upcoming' && s.status !== 'offline')) return null;
   const name = PROVIDER_NAMES[s.provider] ?? '';
   const channel = s.channel?.trim() ?? '';
   const base = { status: s.status, provider: s.provider, title: s.title, watchUrl: s.watchUrl, thumbUrl: s.thumbUrl };
   if (s.status === 'offline') {
-    return { ...base, tag: '', kicker: '', meta: channel, viewers: '', thumbUrl: '', watchLabel: 'Watch our channel ↗' };
+    return { ...base, tag: '', kicker: '', meta: channel, viewers: '', thumbUrl: '', watchLabel: w.watchChannel };
   }
-  const watchLabel = name ? `Watch on ${name} ↗` : 'Watch now ↗';
+  const watchLabel = name ? fill(w.watchOn, { provider: name }) : w.watchNow;
   if (s.status === 'upcoming') {
-    const start = s.startedAt > 0 ? `${when(s.startedAt, now)} · ${until(s.startedAt - now)}` : '';
+    const start = s.startedAt > 0 ? `${when(s.startedAt, now, locale)} · ${until(s.startedAt - now, w)}` : '';
     return {
-      ...base, tag: start || 'UPCOMING', kicker: name ? `UPCOMING ON ${name.toUpperCase()}` : 'UPCOMING',
-      meta: [channel, name && 'scheduled'].filter(Boolean).join(' · '), viewers: '', watchLabel: name ? `Open on ${name} ↗` : 'Open ↗',
+      ...base, tag: start || w.upcoming, kicker: name ? fill(w.upcomingOn, { provider: name.toUpperCase() }) : w.upcoming,
+      meta: [channel, name && w.scheduled].filter(Boolean).join(' · '), viewers: '', watchLabel: name ? fill(w.openOn, { provider: name }) : w.open,
     };
   }
-  const started = s.startedAt > 0 && s.startedAt <= now ? `started ${ago(now - s.startedAt)}` : '';
+  const started = s.startedAt > 0 && s.startedAt <= now ? fill(w.started, { time: ago(now - s.startedAt, w) }) : '';
   return {
-    ...base, tag: 'LIVE', kicker: name ? `LIVE ON ${name.toUpperCase()}` : 'LIVE NOW',
+    ...base, tag: w.tag, kicker: name ? fill(w.liveOn, { provider: name.toUpperCase() }) : w.liveNow,
     meta: [channel, started].filter(Boolean).join(' · '),
-    viewers: typeof s.viewers === 'number' ? `${compactCount(s.viewers)} watching` : '',
+    viewers: typeof s.viewers === 'number' ? fill(w.watching, { count: compactCount(s.viewers) }) : '',
     watchLabel,
   };
 }

package/src/lib/live/words.ts

@@ -0,0 +1,94 @@
+// Words the website's live surfaces show: the live card (view.ts, LiveCard)
+// and the site-wide bar, header marker and dock (Site.astro). Plain strings
+// with {provider}, {time}, {count}, {n} and {title} slots, so LiveCard can
+// hand them to its browser script as JSON. Spanish matches the app's words
+// (packages/native strings.ts) where they overlap. Other languages fall back
+// to English.
+export interface LiveStrings {
+  /** poster tag while live */
+  tag: string;
+  /** above the title: without a provider name, then with it (upper-cased) */
+  liveNow: string;
+  liveOn: string;
+  upcoming: string;
+  upcomingOn: string;
+  watchOn: string;
+  watchNow: string;
+  openOn: string;
+  open: string;
+  watchChannel: string;
+  /** after the channel name of an upcoming broadcast */
+  scheduled: string;
+  /** after the channel name while live: "started {time}" with {time} from `ago` */
+  started: string;
+  justNow: string;
+  ago: string;
+  startingNow: string;
+  in: string;
+  day: string;
+  days: string;
+  watching: string;
+  notLive: string;
+  /** the card's label and the player's title when the stream has none */
+  video: string;
+  playHere: string;
+  play: string;
+  /** under the in-page player button; {provider} falls back to `platform` */
+  privacy: string;
+  platform: string;
+  /** site-wide signals */
+  bar: string;
+  watch: string;
+  dismissBar: string;
+  marker: string;
+  dismissDock: string;
+}
+
+const STRINGS: Record<string, LiveStrings> = {
+  en: {
+    tag: 'LIVE', liveNow: 'LIVE NOW', liveOn: 'LIVE ON {provider}', upcoming: 'UPCOMING', upcomingOn: 'UPCOMING ON {provider}',
+    watchOn: 'Watch on {provider} ↗', watchNow: 'Watch now ↗', openOn: 'Open on {provider} ↗', open: 'Open ↗', watchChannel: 'Watch our channel ↗',
+    scheduled: 'scheduled', started: 'started {time}', justNow: 'just now', ago: '{time} ago', startingNow: 'starting now', in: 'in {time}', day: '{n} day', days: '{n} days',
+    watching: '{count} watching', notLive: 'Not live right now', video: 'Live video', playHere: 'Play here', play: 'Play {title} here',
+    privacy: 'Playing loads video from {provider}.', platform: 'the platform',
+    bar: 'Live now', watch: 'Watch →', dismissBar: 'Dismiss live notice', marker: 'Live', dismissDock: 'Dismiss live player',
+  },
+  es: {
+    tag: 'EN VIVO', liveNow: 'EN VIVO AHORA', liveOn: 'EN VIVO EN {provider}', upcoming: 'PRÓXIMAMENTE', upcomingOn: 'PRÓXIMAMENTE EN {provider}',
+    watchOn: 'Ver en {provider} ↗', watchNow: 'Ver ahora ↗', openOn: 'Abrir en {provider} ↗', open: 'Abrir ↗', watchChannel: 'Ver nuestro canal ↗',
+    scheduled: 'programado', started: 'empezó {time}', justNow: 'hace un momento', ago: 'hace {time}', startingNow: 'empieza ahora', in: 'en {time}', day: '{n} día', days: '{n} días',
+    watching: '{count} viendo', notLive: 'No estamos en vivo ahora', video: 'Video en vivo', playHere: 'Reproducir aquí', play: 'Reproducir {title} aquí',
+    privacy: 'Al reproducir, el video se carga desde {provider}.', platform: 'la plataforma',
+    bar: 'En vivo', watch: 'Ver →', dismissBar: 'Cerrar aviso', marker: 'En vivo', dismissDock: 'Cerrar reproductor',
+  },
+  fr: {
+    tag: 'EN DIRECT', liveNow: 'EN DIRECT', liveOn: 'EN DIRECT SUR {provider}', upcoming: 'À VENIR', upcomingOn: 'BIENTÔT SUR {provider}',
+    watchOn: 'Regarder sur {provider} ↗', watchNow: 'Regarder ↗', openOn: 'Ouvrir sur {provider} ↗', open: 'Ouvrir ↗', watchChannel: 'Voir notre chaîne ↗',
+    scheduled: 'programmé', started: 'a commencé {time}', justNow: 'à l’instant', ago: 'il y a {time}', startingNow: 'commence maintenant', in: 'dans {time}', day: '{n} jour', days: '{n} jours',
+    watching: '{count} spectateurs', notLive: 'Pas en direct pour le moment', video: 'Vidéo en direct', playHere: 'Lire ici', play: 'Lire {title} ici',
+    privacy: 'La lecture charge la vidéo depuis {provider}.', platform: 'la plateforme',
+    bar: 'En direct', watch: 'Regarder →', dismissBar: 'Fermer l’avis', marker: 'En direct', dismissDock: 'Fermer le lecteur',
+  },
+  de: {
+    tag: 'LIVE', liveNow: 'JETZT LIVE', liveOn: 'LIVE AUF {provider}', upcoming: 'DEMNÄCHST', upcomingOn: 'DEMNÄCHST AUF {provider}',
+    watchOn: 'Auf {provider} ansehen ↗', watchNow: 'Jetzt ansehen ↗', openOn: 'Auf {provider} öffnen ↗', open: 'Öffnen ↗', watchChannel: 'Zu unserem Kanal ↗',
+    scheduled: 'geplant', started: 'begann {time}', justNow: 'gerade eben', ago: 'vor {time}', startingNow: 'beginnt jetzt', in: 'in {time}', day: '{n} Tag', days: '{n} Tagen',
+    watching: '{count} Zuschauer', notLive: 'Gerade nicht live', video: 'Livevideo', playHere: 'Hier abspielen', play: '{title} hier abspielen',
+    privacy: 'Beim Abspielen wird das Video von {provider} geladen.', platform: 'der Plattform',
+    bar: 'Jetzt live', watch: 'Ansehen →', dismissBar: 'Hinweis schließen', marker: 'Live', dismissDock: 'Player schließen',
+  },
+  pt: {
+    tag: 'AO VIVO', liveNow: 'AO VIVO AGORA', liveOn: 'AO VIVO NO {provider}', upcoming: 'EM BREVE', upcomingOn: 'EM BREVE NO {provider}',
+    watchOn: 'Assistir no {provider} ↗', watchNow: 'Assistir agora ↗', openOn: 'Abrir no {provider} ↗', open: 'Abrir ↗', watchChannel: 'Ver nosso canal ↗',
+    scheduled: 'agendado', started: 'começou {time}', justNow: 'agora mesmo', ago: 'há {time}', startingNow: 'começando agora', in: 'em {time}', day: '{n} dia', days: '{n} dias',
+    watching: '{count} assistindo', notLive: 'Não estamos ao vivo agora', video: 'Vídeo ao vivo', playHere: 'Reproduzir aqui', play: 'Reproduzir {title} aqui',
+    privacy: 'Ao reproduzir, o vídeo é carregado de {provider}.', platform: 'uma plataforma externa',
+    bar: 'Ao vivo', watch: 'Assistir →', dismissBar: 'Fechar aviso', marker: 'Ao vivo', dismissDock: 'Fechar player',
+  },
+};
+
+export const liveStrings = (locale: string | null | undefined): LiveStrings =>
+  STRINGS[(locale || 'en').toLowerCase().split('-')[0]] ?? STRINGS.en;
+
+/** "Watch on {provider}" → "Watch on YouTube"; unknown slots stay as written */
+export const fill = (template: string, values: Record<string, string>) => template.replace(/\{(\w+)\}/g, (m, k: string) => values[k] ?? m);