Changeset 5e61b17 in Klonkt for src/routes

Timestamp:

06/21/2026 03:16:51 PM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

11b3ba5

Parents:

4885eab

Message:

feat(i18n): admin-configurable language — personal + default for visitors

• users.lang column: personal interface language per account (follows across devices/sessions). Switcher (/lang/:code) and Account select both write it.
• app_setting default_lang: admin picks the default language for visitors in Admin → Settings (overrides env/browser; empty = automatic).
• resolveLang priority: session choice → users.lang → default_lang (DB) → env KLONKT_DEFAULT_LANG → browser → nl.
• Account: language select; admin-settings: default language select. NL/EN/DE keys.

Co-Authored-By: Claude <noreply@…>

Location:

src/routes

Files:

• account.js (modified) (3 diffs)
• admin-settings.js (modified) (3 diffs)
• lang.js (modified) (2 diffs)

src/routes/account.js

@@ -26 +26 @@
 import { googleConfigured } from '../config/google.js';
 import { toWebp } from '../services/ImageWebpService.js';
+import { SUPPORTED } from '../services/i18n.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -60 +61 @@
 router.get('/', requireAuth, (req, res) => {
   const account = db.prepare(`
-    SELECT id, username, email, role, bio, avatar_url, created_at, password_hash, google_sub
+    SELECT id, username, email, role, bio, avatar_url, created_at, password_hash, google_sub, lang
     FROM users WHERE id = ?
   `).get(req.session.user.id);
@@ -80 +81 @@
 });
 
+// ==================== PERSOONLIJKE INTERFACE-TAAL ====================
+// Slaat de taalkeuze op het account op (reist mee over apparaten/sessies) én
+// zet 'm meteen in de sessie zodat 't direct effect heeft.
+router.post('/lang', requireAuth, (req, res) => {
+  const code = SUPPORTED.includes(req.body.lang) ? req.body.lang : null;
+  if (code) {
+    db.prepare('UPDATE users SET lang = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(code, req.session.user.id);
+    req.session.user.lang = code;
+    req.session.lang = code;
+  }
+  res.redirect('/account?success=' + encodeURIComponent('Taal opgeslagen'));
+});
+
 // De site die deze gebruiker mag bewerken vanuit z'n account: z'n eigen site
 // (owner_id), of voor een god de primaire site. Null als er niets is.

src/routes/admin-settings.js

@@ -22 +22 @@
 import { requireGod } from '../middleware/auth.js';
 import { getTenancy, setTenancy, getSetting, setSetting } from '../services/SettingsService.js';
+import { SUPPORTED } from '../services/i18n.js';
 import { mailerStatus, sendMail } from '../config/mailer.js';
 import { entitlementStatus, premiumUnlocked } from '../services/PatreonService.js';
@@ -78 +79 @@
     hubHeroImage: getSetting('hub_hero_image') || '',
     hubHeroOverlay: clampOverlay(getSetting('hub_hero_overlay')),
+    defaultLang: getSetting('default_lang') || '',
     premium: entitlementStatus(),
     google: {
@@ -108 +110 @@
       }
       setTenancy(req.body.tenancy); // valideert naar solo | hub | circle
+    }
+    if (typeof req.body.default_lang !== 'undefined') {
+      // Standaardtaal voor bezoekers (leeg = volg env/browser). Valideert tegen NL/EN/DE.
+      const dl = (req.body.default_lang || '').toString().toLowerCase();
+      setSetting('default_lang', SUPPORTED.includes(dl) ? dl : '');
     }
     if (typeof req.body.hub_title !== 'undefined') {

src/routes/lang.js

@@ -3 +3 @@
 import express from 'express';
 import { SUPPORTED } from '../services/i18n.js';
+import db from '../config/database.js';
 
 const router = express.Router();
@@ -9 +10 @@
   const code = SUPPORTED.includes(req.params.code) ? req.params.code : 'nl';
   if (req.session) req.session.lang = code;
+  // Ingelogd? Bewaar de keuze ook op het account zodat 'ie meereist over
+  // apparaten/sessies (niet alleen deze sessie-cookie).
+  if (req.session && req.session.user && req.session.user.id) {
+    try {
+      db.prepare('UPDATE users SET lang = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?').run(code, req.session.user.id);
+      req.session.user.lang = code;
+    } catch { /* lang-kolom ontbreekt op een oude DB → sessie-only, geen breuk */ }
+  }
   // Veilige terug-URL: alleen een intern pad (geen open redirect).
   let back = (typeof req.query.r === 'string') ? req.query.r : '';