@acms-subir/core 0.3.62 → 0.3.63

package/src/pages/book/[resource]/index.astro

@@ -5,6 +5,8 @@ import { bookingLinkUrl, bookingsEnabled, CALENDAR } from '../../../lib/calendar
 import { availabilityContext } from '../../../lib/booking/service';
 import { describeLink, nextOpenings } from '../../../lib/booking/availability';
 import { fmt } from '../../../lib/booking/view';
+import { linkWords, roomName } from '../../../lib/schema';
+import { localePath, requestLocale } from '../../../lib/i18n';
 
 // A room (or person, or van) and its booking links (mockup C): each link is a
 // card with its rules, an Instant / Approval badge, and its next openings —
@@ -30,34 +32,38 @@ const chip = (start: number, link: (typeof links)[number]) => {
   return link.mode === 'slots' ? `${day} ${f.time.format(start)}` : day;
 };
 const facts = [resource.capacity ? `Up to ${resource.capacity}` : '', ...resource.amenities].filter(Boolean);
+// the room and its links named in the page's language, and links that stay in it
+const locale = requestLocale(Astro.url, Astro.locals);
+const room = roomName(resource, locale);
+const here = (path: string) => localePath(path, locale);
 ---
 
-<Site title={resource.name} description={resource.description || `Book ${resource.name}.`} image={resource.photo || undefined} noindex={resource.visibility === 'unlisted'}>
+<Site title={room} description={resource.description || `Book ${room}.`} image={resource.photo || undefined} noindex={resource.visibility === 'unlisted'}>
   <div class="pc-res">
     <div class="pc-res-about">
       {resource.photo ? <img class="pc-res-photo" src={resource.photo} alt="" /> : null}
       <span class="pc-res-kind">{resource.kind}</span>
-      <h1 class="pc-res-title">{resource.name}</h1>
+      <h1 class="pc-res-title">{room}</h1>
       {facts.length > 0 && <ul class="pc-res-facts">{facts.map((x) => <li>{x}</li>)}</ul>}
       {resource.description && <p class="pc-res-desc">{resource.description}</p>}
     </div>
     <div class="pc-res-links">
-      {cards.length === 0 && <p class="pc-bk-empty">Online booking isn’t open for {resource.name} right now.</p>}
+      {cards.length === 0 && <p class="pc-bk-empty">Online booking isn’t open for {room} right now.</p>}
       {cards.map(({ link, next }) => (
         <article class="pc-res-link">
           <div class="pc-res-linkhead">
-            <h2><a href={bookingLinkUrl(resource.slug, link.slug)}>{link.name}</a></h2>
+            <h2><a href={here(bookingLinkUrl(resource.slug, link.slug))}>{linkWords(link, locale).name}</a></h2>
             <span class={`pc-res-badge${link.autoConfirm ? ' is-instant' : ''}`}>{link.autoConfirm ? 'Instant' : 'Approval'}</span>
           </div>
-          <p>{[describeLink(link), link.description].filter(Boolean).join(' · ')}</p>
+          <p>{[describeLink(link), linkWords(link, locale).description].filter(Boolean).join(' · ')}</p>
           <div class="pc-res-next">
-            {next.map((s) => <a href={`${bookingLinkUrl(resource.slug, link.slug)}?date=${new Intl.DateTimeFormat('en-CA', { timeZone: tz, year: 'numeric', month: '2-digit', day: '2-digit' }).format(s.start)}&start=${s.start}&len=${s.minutes}`}>{chip(s.start, link)}</a>)}
+            {next.map((s) => <a href={`${here(bookingLinkUrl(resource.slug, link.slug))}?date=${new Intl.DateTimeFormat('en-CA', { timeZone: tz, year: 'numeric', month: '2-digit', day: '2-digit' }).format(s.start)}&start=${s.start}&len=${s.minutes}`}>{chip(s.start, link)}</a>)}
             {next.length === 0 && <span class="pc-res-none">No openings soon</span>}
-            <a class="pc-res-more" href={bookingLinkUrl(resource.slug, link.slug)}>{next.length ? 'More times ›' : 'See calendar ›'}</a>
+            <a class="pc-res-more" href={here(bookingLinkUrl(resource.slug, link.slug))}>{next.length ? 'More times ›' : 'See calendar ›'}</a>
           </div>
         </article>
       ))}
-      <p class="pc-bk-foot"><a href={CALENDAR.bookBase}>All rooms and people</a></p>
+      <p class="pc-bk-foot"><a href={here(CALENDAR.bookBase)}>All rooms and people</a></p>
     </div>
   </div>
 </Site>

package/src/pages/book/index.astro

@@ -2,6 +2,8 @@
 import Site from '../../layouts/Site.astro';
 import { getRepo } from '../../lib/repo';
 import { CALENDAR, bookingsEnabled, resourceUrl, bookingLinkUrl } from '../../lib/calendar/config';
+import { linkWords, roomName } from '../../lib/schema';
+import { localePath, requestLocale } from '../../lib/i18n';
 
 // Directory of everything bookable: public resources grouped by kind, each
 // with its public booking links.
@@ -13,6 +15,9 @@ const byKind = new Map<string, typeof listed>();
 for (const r of listed) byKind.set(r.kind, [...(byKind.get(r.kind) ?? []), r]);
 const linksOf = (id: string) => links.filter((l) => l.resourceId === id && l.active && l.visibility === 'public');
 const plural = (k: string) => (k.endsWith('s') ? k : k.endsWith('y') ? `${k.slice(0, -1)}ies` : `${k}s`);
+// rooms and links named in the page's language, and links that stay in it
+const locale = requestLocale(Astro.url, Astro.locals);
+const here = (path: string) => localePath(path, locale);
 ---
 
 <Site title="Book" description={`Book rooms and time at ${settings.siteTitle}.`}>
@@ -32,11 +37,11 @@ const plural = (k: string) => (k.endsWith('s') ? k : k.endsWith('y') ? `${k.slic
         <div class="pc-dir-grid">
           {list.map((r) => (
             <article class="pc-dir-card">
-              <a class="pc-dir-media" href={resourceUrl(r.slug)} tabindex="-1" aria-hidden="true">{r.photo ? <img src={r.photo} alt="" loading="lazy" /> : <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21V9l9-5 9 5v12M9 21v-6h6v6" /></svg>}</a>
+              <a class="pc-dir-media" href={here(resourceUrl(r.slug))} tabindex="-1" aria-hidden="true">{r.photo ? <img src={r.photo} alt="" loading="lazy" /> : <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21V9l9-5 9 5v12M9 21v-6h6v6" /></svg>}</a>
               <div class="pc-dir-body">
-                <h3><a href={resourceUrl(r.slug)}>{r.name}</a></h3>
+                <h3><a href={here(resourceUrl(r.slug))}>{roomName(r, locale)}</a></h3>
                 <p>{[r.capacity ? `Up to ${r.capacity}` : '', ...r.amenities.slice(0, 3)].filter(Boolean).join(' · ')}</p>
-                <div class="pc-dir-links">{linksOf(r.id).map((l) => <a href={bookingLinkUrl(r.slug, l.slug)}>{l.name}</a>)}</div>
+                <div class="pc-dir-links">{linksOf(r.id).map((l) => <a href={here(bookingLinkUrl(r.slug, l.slug))}>{linkWords(l, locale).name}</a>)}</div>
               </div>
             </article>
           ))}

package/src/pages/book/manage/[token].astro

@@ -5,6 +5,8 @@ import { CALENDAR, bookingLinkUrl, bookingsEnabled, eventUrl, resourceUrl } from
 import { confirmOffer, guestCancel, guestChanges, waitlistPosition, BookingError, WAITLIST_HOLD } from '../../../lib/booking/service';
 import { bookingIcs, whenText } from '../../../lib/booking/emails';
 import { resourceZone } from '../../../lib/booking/availability';
+import { bookingTitle } from '../../../lib/booking/view';
+import { roomName } from '../../../lib/schema';
 import { eventTimeZone, locationLine } from '../../../lib/calendar/events';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
@@ -43,8 +45,8 @@ const lang = locale || siteLang(settings);
 const bw = bookingStrings(lang).page;
 const w = isRsvp ? rsvpStrings(lang) : { ...rsvpStrings(lang), ...bw };
 const event = rawEvent && localizeDoc(rawEvent, locale || undefined);
-const title = event ? event.title : [resource?.name, link?.name].filter(Boolean).join(' · ') || bw.untitled;
-const location = event ? locationLine(event.location) : resource?.name ?? '';
+const title = event ? event.title : bookingTitle(resource, link, locale) || bw.untitled;
+const location = event ? locationLine(event.location) : resource ? roomName(resource, locale) : '';
 // the address the visitor sees (/es/… is rewritten to this route)
 const url = origin + localePath(Astro.url.pathname, locale);
 
@@ -166,7 +168,7 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
     )}
     {can.closed && <p class="pc-manage-note">{cutoff}</p>}
     <p class="pc-bk-foot">
-      {event ? <a href={localePath(eventUrl(event.slug), locale)}>{fill(w.backTo, { title: event.title })}</a> : resource ? <a href={resourceUrl(resource.slug)}>{fill(w.backTo, { title: resource.name })}</a> : null}
+      {event ? <a href={localePath(eventUrl(event.slug), locale)}>{fill(w.backTo, { title: event.title })}</a> : resource ? <a href={resourceUrl(resource.slug)}>{fill(w.backTo, { title: roomName(resource, locale) })}</a> : null}
     </p>
     <p class="pc-manage-note">{w.keepLink}</p>
   </div>

package/src/pages/embed/book/[resource]/[link].astro

@@ -4,25 +4,33 @@ import BookingFlow from '../../../../components/booking/BookingFlow.astro';
 import { getRepo } from '../../../../lib/repo';
 import { bookingLinkUrl, bookingsEnabled } from '../../../../lib/calendar/config';
 import { availabilityContext } from '../../../../lib/booking/service';
+import { I18N, localePath } from '../../../../lib/i18n';
+import { linkWords } from '../../../../lib/schema';
 
 // Embeddable picker for other sites: day + time selection happens inside the
 // iframe; choosing a time opens the full booking page (top window) to finish.
+// ?lang=es (one of the site's languages; embeds are never under /es) names the
+// link and room in it and hands off to that language's page.
 if (!bookingsEnabled()) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const resource = await repo.getResourceBySlug(Astro.params.resource ?? '');
 const link = resource ? await repo.getBookingLinkBySlug(resource.id, Astro.params.link ?? '') : null;
 if (!resource || !link || !link.active) return new Response(null, { status: 404 });
 const settings = await repo.getSettings();
+const langParam = Astro.url.searchParams.get('lang') ?? '';
+const locale = I18N.enabled && I18N.locales.includes(langParam) ? langParam : '';
 // a chosen time hands off to the real page, where the form lives
 if (Astro.url.searchParams.get('start')) {
-  return Astro.redirect(`${bookingLinkUrl(resource.slug, link.slug)}${Astro.url.search}`);
+  const search = new URLSearchParams(Astro.url.search);
+  search.delete('lang');
+  return Astro.redirect(`${localePath(bookingLinkUrl(resource.slug, link.slug), locale)}?${search}`);
 }
 const ctx = await availabilityContext(repo, resource, link, settings);
 Astro.response.headers.set('Content-Security-Policy', 'frame-ancestors *');
 ---
 
-<Site title={link.name} bare noindex>
-  <BookingFlow resource={resource} link={link} ctx={ctx} settings={settings} url={Astro.url} embed />
+<Site title={linkWords(link, locale).name} bare noindex>
+  <BookingFlow resource={resource} link={link} ctx={ctx} settings={settings} url={Astro.url} embed locale={locale} />
   <script is:inline>
     (function () {
       var send = function () { parent.postMessage({ acmsBookingEmbed: true, height: document.documentElement.scrollHeight }, '*'); };