@jant/core 0.6.16 → 0.7.0

package/src/ui/dash/appearance/NavigationContent.tsx

@@ -11,6 +11,8 @@ import type {
   SystemNavKey,
 } from "../../../types.js";
 import { SYSTEM_NAV_KEYS } from "../../../types.js";
+import { getSystemNavDescription } from "./system-nav-descriptions.js";
+import { getSmartCollectionLabels } from "../../shared/smart-collection-labels.js";
 import type {
   NavManagerCollection,
   NavManagerLabels,
@@ -19,10 +21,12 @@ import type {
 } from "../../../client/components/nav-manager-types.js";
 import type { CollectionFormLabels } from "../../../client/components/collection-types.js";
 import { toPublicHref, toPublicPath } from "../../../lib/url.js";
-import { getCollectionFormLabels } from "../../shared/collection-management-labels.js";
+import {
+  getCollectionDialogLabels,
+  getCollectionFormLabels,
+} from "../../shared/collection-management-labels.js";
 import {
   getNavItemDisplayLabel,
-  getSystemNavDescription,
   getSystemNavDisplayLabel,
   NAV_MORE_LABEL,
 } from "../../shared/navigation-labels.js";
@@ -210,16 +214,35 @@ export function NavigationContent({
           slug: item.collection.slug,
           group: currentGroup,
         });
+      } else if (item.type === "smart_collection" && item.smartCollection) {
+        result.push({
+          id: item.smartCollection.id,
+          title: item.smartCollection.title,
+          slug: item.smartCollection.slug,
+          group: currentGroup,
+          isSmart: true,
+        });
       }
     }
 
-    // Append collections not in directory items
+    // Append anything with no directory row, both kinds alike.
     const includedIds = new Set(result.map((c) => c.id));
     for (const c of directoryData.collections) {
       if (!includedIds.has(c.id)) {
         result.push({ id: c.id, title: c.title, slug: c.slug, group: null });
       }
     }
+    for (const c of directoryData.smartCollections) {
+      if (!includedIds.has(c.id)) {
+        result.push({
+          id: c.id,
+          title: c.title,
+          slug: c.slug,
+          group: null,
+          isSmart: true,
+        });
+      }
+    }
 
     return result;
   })();
@@ -237,20 +260,17 @@ export function NavigationContent({
   ).map((key) => ({
     key,
     label: getSystemNavDisplayLabel(key, i18n),
-    description:
+    // Only the RSS line takes a value: it names which end /feed currently
+    // returns. The strings live in `system-nav-descriptions.ts` so the RSS and
+    // Subscribe pair stays written — and edited — together, and so they land in
+    // the translated catalog rather than the English-only public one.
+    description: getSystemNavDescription(
+      key,
+      i18n,
       key === "rss"
-        ? i18n._(
-            msg({
-              message:
-                "Header RSS points to your {feed} feed (/feed). Change what /feed returns in General.",
-              comment:
-                "@context: Description for the RSS system navigation toggle. {feed} is either Latest or Featured.",
-            }),
-            {
-              feed: mainRssFeed === "latest" ? latestLabel : featuredLabel,
-            },
-          )
-        : getSystemNavDescription(key, i18n),
+        ? { feed: mainRssFeed === "latest" ? latestLabel : featuredLabel }
+        : undefined,
+    ),
   }));
 
   const labels: NavManagerLabels = {
@@ -406,6 +426,7 @@ export function NavigationContent({
           "@context: Section label for nav items hidden under More dropdown",
       }),
     ),
+    previewMore: moreLabel,
     moreEmptyHint: i18n._(
       msg({
         message: "Drag links here to show them under the More menu",
@@ -480,12 +501,83 @@ export function NavigationContent({
         comment: "@context: Placeholder for the navigation page search",
       }),
     ),
+    searchPagesHint: i18n._(
+      msg({
+        message: "Search pages, or paste an address",
+        comment:
+          "@context: Placeholder for the navigation page search, which also accepts a pasted URL or path",
+      }),
+    ),
     recentPages: i18n._(
       msg({
         message: "Recently updated",
         comment: "@context: Heading above recent pages in the page picker",
       }),
     ),
+    addressMatch: i18n._(
+      msg({
+        message: "At that address",
+        comment:
+          "@context: Heading above the page a pasted address resolved to",
+      }),
+    ),
+    addressAlreadyAdded: i18n._(
+      msg({
+        message: "Already in navigation. Drag it in the list above to move it.",
+        comment:
+          "@context: Shown when a pasted address is already a navigation item",
+      }),
+    ),
+    addressNotFound: i18n._(
+      msg({
+        message: "Nothing at {address}. Check it, or search by title.",
+        comment:
+          "@context: Shown when a pasted address matches no page on the site",
+      }),
+      // Filled in the browser with the address that was looked up.
+      { address: "{address}" },
+    ),
+    addressUnpublished: i18n._(
+      msg({
+        message: "That page is a draft. Publish it, then add it.",
+        comment: "@context: Shown when a pasted address resolves to a draft",
+      }),
+    ),
+    addressPrivate: i18n._(
+      msg({
+        message: "That page is private, so nobody could open it from a menu.",
+        comment:
+          "@context: Shown when a pasted address resolves to a private page",
+      }),
+    ),
+    addressUntitled: i18n._(
+      msg({
+        message: "That page has no title yet, so a menu has nothing to show.",
+        comment:
+          "@context: Shown when a pasted address resolves to an untitled post",
+      }),
+    ),
+    addressExternal: i18n._(
+      msg({
+        message:
+          "That address is on another site. Navigation holds it as a link.",
+        comment: "@context: Shown when a pasted address points off the site",
+      }),
+    ),
+    addressLinkOnly: i18n._(
+      msg({
+        message: "Navigation holds that address as a link.",
+        comment:
+          "@context: Shown for a page on the site that can only be a link, such as an archive URL",
+      }),
+    ),
+    addressAddAsLink: i18n._(
+      msg({
+        message: "Add as link",
+        comment:
+          "@context: Button that opens the link form with the pasted address filled in",
+      }),
+    ),
     searchingPages: i18n._(
       msg({
         message: "Searching pages…",
@@ -643,6 +735,7 @@ export function NavigationContent({
         comment: "@context: Button for adding a collection to nav",
       }),
     ),
+    smartCollectionLabel: getSmartCollectionLabels(i18n).noun,
     addCollectionToNavigation: i18n._(
       msg({
         message: "Add collection to navigation",
@@ -729,6 +822,14 @@ export function NavigationContent({
 
   return (
     <div class="max-w-3xl flex flex-col gap-8">
+      {/* The dialog is a Lit component and cannot reach the i18n catalogs, so
+          the page that can open it carries its strings. */}
+      <div
+        hidden
+        data-collection-dialog-labels={escapeJson(
+          getCollectionDialogLabels(i18n),
+        )}
+      />
       <jant-nav-manager
         items={escapeJson(itemsData)}
         labels={escapeJson(labels)}

package/src/ui/dash/appearance/__tests__/NavigationContent.test.tsx

@@ -1,6 +1,7 @@
 import type { Context } from "hono";
 import { renderToString } from "hono/jsx/dom/server";
 import { describe, expect, it } from "vitest";
+import { readComponentCss } from "../../../../__tests__/helpers/component-css.js";
 import { I18nProvider } from "../../../../i18n/context.js";
 import { createI18n } from "../../../../i18n/i18n.js";
 import { NavigationContent } from "../NavigationContent.js";
@@ -21,7 +22,12 @@ function renderNavigationContent(
   return renderToString(
     NavigationContent({
       navItems: [],
-      directoryData: { collections: [], items: [], directoryItems: [] },
+      directoryData: {
+        collections: [],
+        smartCollections: [],
+        items: [],
+        directoryItems: [],
+      },
       suggestedLinks: [],
       mainRssFeed: "latest",
       rssFeedsEnabled: true,
@@ -32,20 +38,24 @@ function renderNavigationContent(
 }
 
 describe("NavigationContent", () => {
-  it("interpolates the latest feed label in the RSS system link description", () => {
-    const html = renderNavigationContent({ mainRssFeed: "latest" });
-
-    expect(html).toContain(
-      "Header RSS points to your Latest feed (/feed). Change what /feed returns in General.",
+  it("names which end the RSS entry currently points at", () => {
+    expect(renderNavigationContent({ mainRssFeed: "latest" })).toContain(
+      "currently your Latest feed",
+    );
+    expect(renderNavigationContent({ mainRssFeed: "featured" })).toContain(
+      "currently your Featured feed",
     );
   });
 
-  it("interpolates the featured feed label in the RSS system link description", () => {
-    const html = renderNavigationContent({ mainRssFeed: "featured" });
+  // RSS and Subscribe are the only pair an author has to choose between, and
+  // they are adjacent switches. Each has to say who it is for, or the choice is
+  // two near-identical toggles.
+  it("offers RSS and Subscribe as a legible choice", () => {
+    const html = renderNavigationContent({ mainRssFeed: "latest" });
 
-    expect(html).toContain(
-      "Header RSS points to your Featured feed (/feed). Change what /feed returns in General.",
-    );
+    expect(html).toContain("already use a feed reader");
+    expect(html).toContain("a page listing your feeds with copy buttons");
+    expect(html).toContain("don't already use one");
   });
 
   it("renders the built-in links heading", () => {
@@ -93,4 +103,16 @@ describe("NavigationContent", () => {
     expect(html).toContain("suggested-links=");
     expect(html).toContain(""targetLabel":"Collection"");
   });
+
+  it("leaves the preview frame unclipped so the More menu can escape it", () => {
+    const css = readComponentCss();
+    const frame = css.match(/\.nav-preview \{[^}]*\}/)?.[0] ?? "";
+
+    // The menu opens below the frame's own bottom edge. Clipping here cuts it
+    // off entirely — a stacking order cannot escape an ancestor's overflow.
+    expect(frame).not.toContain("overflow-hidden");
+    expect(css).toMatch(
+      /\.nav-preview-chrome \{[\s\S]*?border-top-left-radius/,
+    );
+  });
 });

package/src/ui/dash/appearance/__tests__/system-nav-descriptions.test.ts

@@ -0,0 +1,44 @@
+import type { I18n, MessageDescriptor } from "@lingui/core";
+import { describe, expect, it } from "vitest";
+import { getSystemNavDescription } from "../system-nav-descriptions.js";
+
+const i18n = {
+  _(descriptor: MessageDescriptor, values?: Record<string, unknown>) {
+    const message = descriptor.message ?? "";
+    return values
+      ? message.replace(/\{(\w+)\}/g, (_, key: string) => String(values[key]))
+      : message;
+  },
+} satisfies Pick<I18n, "_">;
+
+describe("getSystemNavDescription", () => {
+  it("describes each system nav toggle", () => {
+    expect(getSystemNavDescription("latest", i18n)).toBe(
+      "Link to your latest posts. Your homepage shows this feed.",
+    );
+    expect(getSystemNavDescription("featured", i18n)).toBe(
+      "Link to posts you've marked as featured.",
+    );
+    expect(getSystemNavDescription("archive", i18n)).toBe(
+      "Link to the post archive",
+    );
+  });
+
+  it("names which end the RSS entry currently points at", () => {
+    expect(getSystemNavDescription("rss", i18n, { feed: "Latest" })).toContain(
+      "currently your Latest feed",
+    );
+  });
+
+  // The two feed entries are the only pair an author has to choose between, so
+  // each has to say who it is for. Losing either half loses the choice.
+  it("tells the two feed entries apart by who they are for", () => {
+    const rss = getSystemNavDescription("rss", i18n, { feed: "Latest" });
+    const subscribe = getSystemNavDescription("subscribe", i18n);
+
+    expect(rss).toContain("/feed");
+    expect(rss).toContain("already use a feed reader");
+    expect(subscribe).toContain("/subscribe");
+    expect(subscribe).toContain("don't already use one");
+  });
+});

package/src/ui/dash/appearance/system-nav-descriptions.ts

@@ -0,0 +1,75 @@
+/**
+ * The line under each system nav toggle in Appearance, saying what turning it
+ * on does.
+ *
+ * These live under `ui/dash/` rather than beside the nav labels in `ui/shared/`
+ * because that is what puts them in the translated catalog: `lingui.config`
+ * splits by path, and only `routes/dash/**`, `ui/dash/**` and the setup page
+ * are translated. The labels themselves stay in `ui/shared/` — they render in
+ * the public site nav, which is English in every view.
+ */
+
+import { msg } from "@lingui/core/macro";
+import type { MessageDescriptor } from "@lingui/core";
+import type { I18n, TranslationValues } from "../../../i18n/i18n.js";
+import type { SystemNavKey } from "../../../types.js";
+
+type Translator = Pick<I18n, "_">;
+
+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",
+  }),
+  // These two sit next to each other in the same list and are the only pair an
+  // author has to choose between, so they are written as a contrast: the raw
+  // file versus the page about it, readers who already have a feed reader
+  // versus readers who do not. Change one and change the other.
+  rss: msg({
+    message:
+      "Links straight to /feed — the raw Atom file, currently your {feed} feed. Best for readers who already use a feed reader.",
+    comment:
+      "@context: Description for the RSS system navigation toggle. {feed} is either Latest or Featured. Pairs with the Subscribe toggle's description.",
+  }),
+  subscribe: msg({
+    message:
+      "Links to /subscribe, a page listing your feeds with copy buttons. Best for readers who don't already use one.",
+    comment:
+      "@context: Description for the Subscribe system navigation toggle. Pairs with the RSS toggle's description.",
+  }),
+  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",
+  }),
+};
+
+/**
+ * The description for one system nav toggle.
+ *
+ * @param key - Which system nav entry
+ * @param i18n - Translator for the current request
+ * @param values - Placeholder values, for the descriptions that carry one
+ * @returns The description text
+ * @example
+ * getSystemNavDescription("rss", i18n, { feed: "Latest" });
+ */
+export function getSystemNavDescription(
+  key: SystemNavKey,
+  i18n: Translator,
+  values?: TranslationValues,
+): string {
+  return i18n._(SYSTEM_NAV_DESCRIPTIONS[key], values);
+}

package/src/ui/dash/settings/AccountMenuContent.tsx

@@ -5,6 +5,7 @@
 import { msg } from "@lingui/core/macro";
 import { coalesceDisplayText } from "../../../lib/display-text.js";
 import { useLingui } from "../../../i18n/context.js";
+import { getJantDocsUrl } from "../../../lib/jant-docs.js";
 import { extractDomain, toPublicPath } from "../../../lib/url.js";
 import { CORE_VERSION } from "../../../lib/version.js";
 import {
@@ -13,8 +14,7 @@ import {
   SettingsDirectorySection,
 } from "./SettingsDirectory.js";
 
-const BACKUPS_DOCS_URL =
-  "https://github.com/jant-me/jant/blob/main/docs/backups.md";
+const BACKUPS_DOCS_URL = getJantDocsUrl("backups");
 const GITHUB_COMMIT_BASE = "https://github.com/jant-me/jant/tree";
 
 const ICONS = {

package/src/ui/dash/settings/ApiTokensContent.tsx

@@ -9,10 +9,11 @@ import { msg } from "@lingui/core/macro";
 import { useLingui } from "../../../i18n/context.js";
 import type { ApiToken } from "../../../types/entities.js";
 import { buildConfirmActionExpression } from "../../../lib/confirm.js";
+import { getJantDocsUrl } from "../../../lib/jant-docs.js";
 import { formatDate } from "../../../lib/time.js";
 import { toPublicPath } from "../../../lib/url.js";
 
-const API_DOCS_URL = "https://github.com/jant-me/jant/blob/main/docs/API.md";
+const API_DOCS_URL = getJantDocsUrl("api");
 
 function TokenRow({
   token,

package/src/ui/dash/settings/ConfigEditorContent.tsx

@@ -76,27 +76,23 @@ export function ConfigEditorContent({
         "zh-Hant": "繁體中文",
       },
     },
-    CJK_SERIF_FONT: {
+    MULTILINGUAL_ENABLED: {
       description: i18n._(
         msg({
           message:
-            "The serif fallback used when the content language has no built-in profile.",
-          comment: "@context: Config Editor setting description",
+            "Whether each language gets its own home page, archive, and feed. Managed on the Language page.",
+          comment: "@context: Config Editor linked setting description",
+        }),
+      ),
+    },
+    ADDITIONAL_LANGUAGES: {
+      description: i18n._(
+        msg({
+          message:
+            "The languages served under a URL prefix. Managed on the Language page.",
+          comment: "@context: Config Editor linked setting description",
         }),
       ),
-      optionLabels: {
-        off: i18n._(
-          msg({
-            message: "Follow content language",
-            comment:
-              "@context: Config Editor enum option for automatic CJK font fallback",
-          }),
-        ),
-        "zh-Hans": "简体中文",
-        "zh-Hant": "繁體中文",
-        ja: "日本語",
-        ko: "한국어",
-      },
     },
     MAIN_RSS_FEED: {
       description: i18n._(
@@ -120,6 +116,29 @@ export function ConfigEditorContent({
         ),
       },
     },
+    ARCHIVE_DEFAULT_LAYOUT: {
+      description: i18n._(
+        msg({
+          message:
+            "Which layout /archive opens with. Readers can switch layouts from the page.",
+          comment: "@context: Config Editor setting description",
+        }),
+      ),
+      optionLabels: {
+        list: i18n._(
+          msg({
+            message: "Full posts",
+            comment: "@context: Config Editor archive layout enum option",
+          }),
+        ),
+        grid: i18n._(
+          msg({
+            message: "Tile grid",
+            comment: "@context: Config Editor archive layout enum option",
+          }),
+        ),
+      },
+    },
     PAGE_SIZE: {
       description: i18n._(
         msg({