@jant/core 0.6.16 → 0.7.0

package/src/ui/shared/archive-labels.ts

@@ -0,0 +1,98 @@
+import { msg } from "@lingui/core/macro";
+import type { I18n } from "../../i18n/i18n.js";
+import type {
+  DimensionContext,
+  PostFilterSelection,
+} from "../../lib/filter-dimensions.js";
+import {
+  describeFilterSelection,
+  hasFilterSelection,
+} from "../../lib/filter-dimensions.js";
+
+type Translator = Pick<I18n, "_">;
+
+export {
+  getFormatLabelPlural,
+  getMediaKindLabel,
+  getVisibilityLabel,
+} from "../../lib/filter-dimensions.js";
+
+/**
+ * The name of the unfiltered archive, shared by the page heading and the
+ * document title so both resolve to one Lingui hash and can never drift into
+ * two different words for the same surface.
+ */
+export const ARCHIVE_ALL_POSTS_LABEL = msg({
+  message: "All posts",
+  comment:
+    "@context: Archive page heading and document title when no filter is active. Names the surface, not the current selection — the nav calls the same destination 'All'.",
+});
+
+/** Whether any filter dimension is active. `sort` and `layout` are not filters. */
+export function hasActiveArchiveFilter(
+  selection: PostFilterSelection,
+): boolean {
+  return hasFilterSelection(selection);
+}
+
+/**
+ * The active filters reduced to the words a reader sees, most identifying
+ * first.
+ *
+ * The words themselves come from the dimension registry, which owns the
+ * vocabulary. What lives here is the archive's *composition* of them: the
+ * ordering, and the one place a dimension absorbs another.
+ *
+ * This is the vocabulary only — every surface composes it differently, because
+ * their constraints are opposite. A feed name lives for years in someone's
+ * reader with no UI to inspect it, so it takes the whole list; a browser tab
+ * truncates from the right, so it takes the first two and stops. The registry
+ * order is what makes that truncation safe: a collection title identifies a view
+ * far better than one of three format names, so it leads.
+ *
+ * @param selection - Active filter selection
+ * @param i18n - Translator
+ * @param ctx - Collection vocabulary, for naming a selected collection
+ * @returns Labels in priority order; empty when nothing is filtered
+ * @example
+ * describeArchiveFilters({ format: "quote" }, i18n, {}); // ["Quotes"]
+ */
+export function describeArchiveFilters(
+  selection: PostFilterSelection,
+  i18n: Translator,
+  ctx: DimensionContext = {},
+): string[] {
+  // Title presence absorbs the format it refines, mirroring the filter chip —
+  // `Untitled` says everything `Notes, without title` would. The registry lists
+  // `format` immediately before `title`, so dropping one leaves the other in
+  // exactly the right place.
+  const composed =
+    selection.title !== undefined
+      ? { ...selection, format: undefined }
+      : selection;
+  return describeFilterSelection(composed, i18n, ctx);
+}
+
+/** How many parts a browser tab can carry before it truncates to noise. */
+const TITLE_PART_LIMIT = 2;
+
+/**
+ * Name for a filtered archive view where no surrounding UI explains it —
+ * a browser tab, a bookmark, a shared link's preview.
+ *
+ * @param selection - Active filter selection
+ * @param i18n - Translator
+ * @param ctx - Collection vocabulary, for naming a selected collection
+ * @returns Capped description, or the unfiltered name when nothing is filtered
+ * @example
+ * getArchiveViewTitle({ year: 2024 }, i18n, {}); // "2024"
+ */
+export function getArchiveViewTitle(
+  selection: PostFilterSelection,
+  i18n: Translator,
+  ctx: DimensionContext = {},
+): string {
+  const parts = describeArchiveFilters(selection, i18n, ctx);
+  if (parts.length === 0) return i18n._(ARCHIVE_ALL_POSTS_LABEL);
+  return parts.slice(0, TITLE_PART_LIMIT).join(", ");
+}

package/src/ui/shared/collection-management-labels.ts

@@ -55,6 +55,28 @@ const collectionFormMessages = {
     message: "Collection created.",
     comment: "@context: Confirmation shown after creating a collection",
   }),
+  cancelLabel: msg({
+    message: "Cancel",
+    comment: "@context: Button to cancel form",
+  }),
+} as const;
+
+/**
+ * The editing dialog's own strings.
+ *
+ * The address and validation wording it shares with the quick-create form
+ * stays in {@link collectionFormMessages}; only what the dialog alone says
+ * lives here.
+ */
+const collectionDialogMessages = {
+  createHeading: msg({
+    message: "New Collection",
+    comment: "@context: Title of the dialog that creates a collection",
+  }),
+  editHeading: msg({
+    message: "Edit Collection",
+    comment: "@context: Title of the dialog that edits an existing collection",
+  }),
   descriptionLabel: msg({
     message: "Description (optional)",
     comment: "@context: Collection form field",
@@ -63,9 +85,9 @@ const collectionFormMessages = {
     message: "What's this collection about?",
     comment: "@context: Collection description placeholder",
   }),
-  sortOrderLabel: msg({
-    message: "Sort Order",
-    comment: "@context: Collection form field",
+  orderBy: msg({
+    message: "Order by",
+    comment: "@context: Collection editing dialog field",
   }),
   sortNewest: msg({
     message: "Newest first",
@@ -79,17 +101,40 @@ const collectionFormMessages = {
     message: "Highest rated",
     comment: "@context: Collection sort order option",
   }),
-  submitLabel: msg({
-    message: "Save",
-    comment: "@context: Button to save collection",
+  loadFailed: msg({
+    message: "Could not open this collection. Try again.",
+    comment: "@context: Collection dialog load failure",
   }),
-  cancelLabel: msg({
-    message: "Cancel",
-    comment: "@context: Button to cancel form",
+  titleAndLinkRequired: msg({
+    message: "A collection needs a title and a link.",
+    comment: "@context: Collection dialog validation message",
+  }),
+} as const;
+
+/**
+ * Address wording both editing dialogs share.
+ *
+ * A collection and a smart collection take the same kind of address out of the
+ * same namespace, so a clash and a move read the same in both.
+ */
+const collectionLinkMessages = {
+  linkTaken: msg({
+    message: "This link is taken. Choose another.",
+    comment:
+      "@context: Collection editing dialog — the typed collection link is already in use",
+  }),
+  linkMovesWarning: msg({
+    message: "Changing the link breaks the old one immediately.",
+    comment:
+      "@context: Collection editing dialog warning shown when editing moves an existing collection link",
   }),
 } as const;
 
 const collectionMutationMessages = {
+  save: msg({
+    message: "Save",
+    comment: "@context: Button to save collection",
+  }),
   edit: msg({
     message: "Edit",
     comment: "@context: Per-collection edit action",
@@ -222,17 +267,50 @@ export const getCollectionFormLabels = (i18n: Translator) => ({
   quickHint: i18n._(collectionFormMessages.quickHint),
   quickSubmitLabel: i18n._(collectionFormMessages.quickSubmitLabel),
   createdLabel: i18n._(collectionFormMessages.createdLabel),
-  descriptionLabel: i18n._(collectionFormMessages.descriptionLabel),
-  descriptionPlaceholder: i18n._(collectionFormMessages.descriptionPlaceholder),
-  sortOrderLabel: i18n._(collectionFormMessages.sortOrderLabel),
-  sortNewest: i18n._(collectionFormMessages.sortNewest),
-  sortOldest: i18n._(collectionFormMessages.sortOldest),
-  sortRatingDesc: i18n._(collectionFormMessages.sortRatingDesc),
-  submitLabel: i18n._(collectionFormMessages.submitLabel),
   cancelLabel: i18n._(collectionFormMessages.cancelLabel),
 });
 
+/**
+ * Every string the editing dialog renders, translated on the server.
+ *
+ * The dialog is a Lit component and cannot reach the i18n catalogs itself, so
+ * whichever page can open it hands them down \u2014 the same arrangement the
+ * smart collection dialog uses.
+ */
+export const getCollectionDialogLabels = (i18n: Translator) => ({
+  createHeading: i18n._(collectionDialogMessages.createHeading),
+  editHeading: i18n._(collectionDialogMessages.editHeading),
+  title: i18n._(collectionFormMessages.titleLabel),
+  titlePlaceholder: i18n._(collectionFormMessages.titlePlaceholder),
+  link: i18n._(collectionFormMessages.slugLabel),
+  linkHelp: i18n._(collectionFormMessages.slugHelp),
+  editLink: i18n._(collectionFormMessages.editSlugLabel),
+  resetLink: i18n._(collectionFormMessages.resetSlugLabel),
+  linkInvalid: i18n._(collectionFormMessages.slugInvalidHelp),
+  linkReserved: i18n._(collectionFormMessages.slugReservedHelp),
+  linkTooLong: i18n._(collectionFormMessages.slugTooLongHelp),
+  linkTaken: i18n._(collectionLinkMessages.linkTaken),
+  linkMovesWarning: i18n._(collectionLinkMessages.linkMovesWarning),
+  description: i18n._(collectionDialogMessages.descriptionLabel),
+  descriptionPlaceholder: i18n._(
+    collectionDialogMessages.descriptionPlaceholder,
+  ),
+  orderBy: i18n._(collectionDialogMessages.orderBy),
+  sortOptions: {
+    newest: i18n._(collectionDialogMessages.sortNewest),
+    oldest: i18n._(collectionDialogMessages.sortOldest),
+    rating_desc: i18n._(collectionDialogMessages.sortRatingDesc),
+  },
+  cancel: i18n._(collectionMutationMessages.cancel),
+  save: i18n._(collectionMutationMessages.save),
+  saved: i18n._(collectionMutationMessages.saved),
+  saveFailed: i18n._(collectionMutationMessages.saveFailed),
+  loadFailed: i18n._(collectionDialogMessages.loadFailed),
+  titleAndLinkRequired: i18n._(collectionDialogMessages.titleAndLinkRequired),
+});
+
 export const getCollectionMutationLabels = (i18n: Translator) => ({
+  save: i18n._(collectionMutationMessages.save),
   edit: i18n._(collectionMutationMessages.edit),
   addToNavigation: i18n._(collectionMutationMessages.addToNavigation),
   addingToNavigation: i18n._(collectionMutationMessages.addingToNavigation),

package/src/ui/shared/navigation-labels.ts

@@ -11,6 +11,7 @@ type NavigationLabelItem = {
   systemKey?: SystemNavKey;
   label: string;
   url: string;
+  targetTitle?: string;
 };
 
 // `context: "nav"` gives these site-header labels a distinct Lingui hash so
@@ -35,9 +36,10 @@ const BUILTIN_NAV_LABELS = {
     comment: "@context: Built-in navigation label for the collections page",
   }),
   archive: msg({
-    message: "Archive",
+    message: "All",
     context: "nav",
-    comment: "@context: Built-in navigation label for the archive page",
+    comment:
+      "@context: Built-in navigation label for the archive page. Reads as the widest of Featured / Latest / All rather than 'old posts' — the page is the complete index, and its URL stays /archive.",
   }),
   settings: msg({
     message: "Settings",
@@ -45,9 +47,16 @@ const BUILTIN_NAV_LABELS = {
     comment: "@context: Built-in navigation label for settings",
   }),
   rss: msg({
-    message: "Feed",
+    message: "RSS",
+    context: "nav",
+    comment:
+      "@context: Built-in navigation label for the feed. Keep the acronym in every locale — it is what readers scan for. The document /feed serves is Atom, but RSS is the category name readers and feed apps use, and it matches the vocabulary the rest of the product already speaks (systemKey `rss`, `mainRssFeed`). 'Feed' would collide with Featured/Latest/All, which are feeds too.",
+  }),
+  subscribe: msg({
+    message: "Subscribe",
     context: "nav",
-    comment: "@context: Built-in navigation label for feed",
+    comment:
+      "@context: Built-in navigation label for the page that explains the site's feeds. Names what the reader wants to do, unlike the sibling RSS entry which names the format and links at the Atom document itself.",
   }),
   signIn: msg({
     message: "Sign in",
@@ -70,42 +79,21 @@ const BUILTIN_NAV_LABELS = {
  */
 export const NAV_MORE_LABEL = BUILTIN_NAV_LABELS.more;
 
-const SYSTEM_NAV_TITLES: Partial<Record<SystemNavKey, MessageDescriptor>> = {
+/**
+ * The default label for every system nav entry.
+ *
+ * Total on purpose: this is the map both the settings toggle list and the
+ * rendered navigation read, so a new `SystemNavKey` without an entry here is a
+ * compile error rather than a nav item that renders blank.
+ */
+const SYSTEM_NAV_TITLES: Record<SystemNavKey, MessageDescriptor> = {
   latest: BUILTIN_NAV_LABELS.latest,
   featured: BUILTIN_NAV_LABELS.featured,
   collections: BUILTIN_NAV_LABELS.collections,
   archive: BUILTIN_NAV_LABELS.archive,
   settings: BUILTIN_NAV_LABELS.settings,
   rss: BUILTIN_NAV_LABELS.rss,
-};
-
-const SYSTEM_NAV_DESCRIPTIONS: Record<SystemNavKey, MessageDescriptor> = {
-  latest: msg({
-    message: "Link to your latest posts. Your homepage shows this feed.",
-    comment: "@context: Description for the latest system navigation toggle",
-  }),
-  featured: msg({
-    message: "Link to posts you've marked as featured.",
-    comment: "@context: Description for the featured system navigation toggle",
-  }),
-  rss: msg({
-    message:
-      "Add a link to your main RSS feed. Change what /feed returns in General.",
-    comment: "@context: Description for the RSS system navigation toggle",
-  }),
-  settings: msg({
-    message: "Shows 'Settings' when logged in, 'Sign in' when logged out",
-    comment: "@context: Description for the settings system navigation toggle",
-  }),
-  collections: msg({
-    message: "Link to your collections page",
-    comment:
-      "@context: Description for the collections system navigation toggle",
-  }),
-  archive: msg({
-    message: "Link to the post archive",
-    comment: "@context: Description for the archive system navigation toggle",
-  }),
+  subscribe: BUILTIN_NAV_LABELS.subscribe,
 };
 
 function getInternalNavPath(url: string, sitePathPrefix = ""): string | null {
@@ -133,26 +121,8 @@ function getBuiltinNavLabelDescriptor(
 ): MessageDescriptor | null {
   if (item.type !== "system" || !item.systemKey) return null;
 
-  if (item.systemKey === "collections") {
-    return BUILTIN_NAV_LABELS.collections;
-  }
-
-  if (item.systemKey === "latest") {
-    return BUILTIN_NAV_LABELS.latest;
-  }
-
-  if (item.systemKey === "featured") {
-    return BUILTIN_NAV_LABELS.featured;
-  }
-
-  if (item.systemKey === "archive") {
-    return BUILTIN_NAV_LABELS.archive;
-  }
-
-  if (item.systemKey === "rss") {
-    return BUILTIN_NAV_LABELS.rss;
-  }
-
+  // Settings is the one entry whose label depends on where it currently
+  // points, so it cannot be read from the key alone.
   if (item.systemKey === "settings") {
     const path = getInternalNavPath(item.url, sitePathPrefix);
     return path === "/signin"
@@ -160,35 +130,39 @@ function getBuiltinNavLabelDescriptor(
       : BUILTIN_NAV_LABELS.settings;
   }
 
-  return null;
+  return SYSTEM_NAV_TITLES[item.systemKey] ?? null;
 }
 
+/**
+ * The text a nav item shows.
+ *
+ * A stored label is always the author's own words, so it wins outright. An
+ * empty one means the item follows what it points at: a built-in destination
+ * shows its translated default, a page or collection shows that row's current
+ * title — which is also how a nav entry ends up in the reader's language once
+ * a language view has resolved it to a translated page.
+ *
+ * @param item - Nav item, view or raw
+ * @param i18n - Translator for built-in destinations
+ * @param sitePathPrefix - Deployment path prefix, such as `/blog`
+ * @returns Label to render
+ */
 export function getNavItemDisplayLabel(
   item: NavigationLabelItem,
   i18n: Translator,
   sitePathPrefix = "",
 ): string {
-  if (item.type === "system" && item.systemKey) {
-    // Non-empty label means the user customized it — use as-is.
-    // Empty label means "use the i18n-translated default".
-    if (item.label) {
-      return item.label;
-    }
-  }
+  if (item.label) return item.label;
+
   const descriptor = getBuiltinNavLabelDescriptor(item, sitePathPrefix);
-  return descriptor ? i18n._(descriptor) : item.label;
-}
+  if (descriptor) return i18n._(descriptor);
 
-export function getSystemNavDisplayLabel(
-  key: SystemNavKey,
-  i18n: Translator,
-): string {
-  return i18n._(SYSTEM_NAV_TITLES[key] ?? BUILTIN_NAV_LABELS.rss);
+  return item.targetTitle?.trim() || item.label;
 }
 
-export function getSystemNavDescription(
+export function getSystemNavDisplayLabel(
   key: SystemNavKey,
   i18n: Translator,
 ): string {
-  return i18n._(SYSTEM_NAV_DESCRIPTIONS[key]);
+  return i18n._(SYSTEM_NAV_TITLES[key]);
 }

package/src/ui/shared/post-article-attributes.ts

@@ -13,6 +13,7 @@ type PostArticleAttributeSource = Pick<
   | "pinnedInCollection"
   | "featured"
   | "draftTailId"
+  | "language"
 >;
 
 /**
@@ -47,6 +48,7 @@ export function getPostArticleAttributes(post: PostArticleAttributeSource) {
       ? { "data-thread-draft-tail-id": post.draftTailId }
       : {}),
     "data-post-visibility": post.visibility,
+    ...(post.language ? { "data-post-language": post.language } : {}),
     ...(isChildPost ? { "data-post-reply": "" } : {}),
   };
 }