Changeset 9a00f28 in Klonkt for src/routes

Timestamp:

07/22/2026 08:18:39 AM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

6b5d7da

Parents:

96c714f

git-author:

Robin <roboburr@…> (07/22/2026 08:18:19 AM)

git-committer:

Robin <roboburr@…> (07/22/2026 08:18:39 AM)

Message:

Fix: test feedback round, cirkels tagline + report details + full i18n

Three findings from Bart's test pass, tied together by the new i18n keys:

1. The admin tagline said "Solo mode" even with Cirkels (federation) on. Solo-tenancy now distinguishes: apEnabled -> "Cirkels-modus: jouw site, verbonden met de fediverse", else the solo line. New key in nl/en/de.

2. Reports only showed who reported; now they show the reason and WHICH post. getNotifications resolves the stored objects URIs of a report: our own /ap/notes/<id> become "Over de post: <title>" links under the description; an empty reason renders "Geen reden opgegeven". Other URIs (the actor itself) are skipped, the row already names the account.

3. Notificaties and Betaalde posts were hardcoded Dutch on an English-configured Klonkt. Everything now goes through t(): the two admin pages (including their client-side status strings, passed via the JSON data block), the admin menu buttons, and the visitor-facing paid pages (gate, passkey, result). Server-side push payloads translate too, using the SITE's content language (fallback KLONKT_DEFAULT_LANG), and the test ping uses the request language. Full nl/en/de dictionaries.

Changed files:
src/services/i18n.js

• admin.tagline_cirkels, admin.b_paid/b_push/back, notif.report_about/ report_noreason, and the push.*, apaid.*, pgate.*, ppk.*, pres.* blocks in nl/en/de

src/routes/admin.js, src/views/pages/admin.ejs

• circlesOn (apEnabled) -> cirkels tagline; menu buttons via t()

src/services/ActivityPubService.js

• report objects resolved to post links; push payloads via i18nT with pushLang(slug) (site language)

src/views/pages/fedi-notifications.ejs

• report reason fallback + "Over de post" links (+ styles)

src/routes/admin-push.js, src/views/pages/admin-push.ejs

• pageTitleKey push.t; all copy + JS status strings via t()

src/routes/admin-paid.js, src/views/pages/admin-paid.ejs

• pageTitleKey apaid.t; all copy via t(), copy-button label via data-attr

src/routes/paid.js

• pageTitleKey pres.t / ppk.t

src/views/pages/paid-gate.ejs, paid-passkey.ejs, paid-result.ejs

• visitor copy + JS strings via t()

src/routes/push.js

• test notification via resolveLang(req)

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Location:

src/routes

Files:

• admin-paid.js (modified) (1 diff)
• admin-push.js (modified) (1 diff)
• admin.js (modified) (2 diffs)
• paid.js (modified) (4 diffs)
• push.js (modified) (2 diffs)

src/routes/admin-paid.js

@@ -36 +36 @@
   if (!gate(req, res)) return;
   renderPage(req, res, 'pages/admin-paid', {
-    pageTitle: 'Betaalde posts',
+    pageTitleKey: 'apaid.t',
     bodyClass: 'on-admin',
     status: PaidPatreon.ownerStatus(res.locals.site.id),

src/routes/admin-push.js

@@ -12 +12 @@
 router.get('/', requireSiteManager, async (req, res) => {
   renderPage(req, res, 'pages/admin-push', {
-    pageTitle: 'Notificaties',
+    pageTitleKey: 'push.t',
     bodyClass: 'on-admin',
     vapidKey: await Push.publicKey(),          // null → feature unavailable

src/routes/admin.js

@@ -9 +9 @@
 import { renderPage } from '../middleware/render.js';
 import { requireAuth } from '../middleware/auth.js';
-import { getTenancy } from '../services/SettingsService.js';
+import { getTenancy, apEnabled } from '../services/SettingsService.js';
 import { getPrimarySite } from '../middleware/site.js';
 
@@ -96 +96 @@
     bodyClass: 'on-admin',
     tenancy,
+    circlesOn: apEnabled(),   // solo vs cirkels tagline (federatie aan/uit)
     primarySite,
     stats,

src/routes/paid.js

@@ -54 +54 @@
   if (!payload || payload.purpose !== 'patron' || payload.siteId !== r.site.id) {
     return renderPage(req, res, 'pages/paid-result', {
-      pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false, reason: 'expired',
+      pageTitleKey: 'pres.t', bodyClass: 'on-special', ok: false, reason: 'expired',
     });
   }
@@ -60 +60 @@
   const code = String(req.query.code || '');
   if (req.query.error || !code) {
-    return renderPage(req, res, 'pages/paid-result', { pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false, reason: 'declined', postSlug: payload.post, patronUrl });
+    return renderPage(req, res, 'pages/paid-result', { pageTitleKey: 'pres.t', bodyClass: 'on-special', ok: false, reason: 'declined', postSlug: payload.post, patronUrl });
   }
   const membership = await PaidPatreon.verifyPatron(r.site.id, code, baseUrl(req) + '/paid/callback').catch(() => null);
@@ -67 +67 @@
   if (!active || cents < payload.cents) {
     return renderPage(req, res, 'pages/paid-result', {
-      pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false,
+      pageTitleKey: 'pres.t', bodyClass: 'on-special', ok: false,
       reason: active ? 'tier' : 'notpatron', neededCents: payload.cents, haveCents: cents, postSlug: payload.post, patronUrl,
     });
@@ -76 +76 @@
   const blob = signBlob({ purpose: 'reg', siteId: r.site.id, cents, challenge: options.challenge }, 900);
   renderPage(req, res, 'pages/paid-passkey', {
-    pageTitle: 'Maak je passkey', bodyClass: 'on-special',
+    pageTitleKey: 'ppk.t', bodyClass: 'on-special',
     optionsJson: JSON.stringify(options), regBlob: blob, postSlug: payload.post,
   });

src/routes/push.js

@@ -9 +9 @@
 import { requireAuth } from '../middleware/auth.js';
 import Push from '../services/PushService.js';
+import { t as i18nT, resolveLang } from '../services/i18n.js';
 
 const router = express.Router();
@@ -55 +56 @@
 // A test ping to all of the caller's own devices (bypasses alert prefs).
 router.post('/test', requireAuth, async (req, res) => {
+  const L = resolveLang(req);
   const sent = await Push.notifyUser(req.session.user.id, {
-    type: 'test', title: 'Klonkt-testnotificatie',
-    body: 'Werkt. Zo komen meldingen binnen op dit apparaat.', url: '/admin/push',
+    type: 'test', title: i18nT(L, 'push.n_test_t'),
+    body: i18nT(L, 'push.n_test_b'), url: '/admin/push',
   });
   res.json({ ok: true, sent });