Changeset 5e61b17 in Klonkt for src/middleware

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@…>

File:

• src/middleware/render.js (modified) (2 diffs)

src/middleware/render.js

@@ -54 +54 @@
   // avatar-wijziging of rolwissel) zichzelf herstelt zonder opnieuw inloggen.
   if (_u && _u.id) {
-    const _fresh = db.prepare('SELECT avatar_url, role FROM users WHERE id = ?').get(_u.id);
-    if (_fresh) _u = { ..._u, avatar_url: _fresh.avatar_url, role: _fresh.role };
+    const _fresh = db.prepare('SELECT avatar_url, role, lang FROM users WHERE id = ?').get(_u.id);
+    if (_fresh) _u = { ..._u, avatar_url: _fresh.avatar_url, role: _fresh.role, lang: _fresh.lang };
   }
   const userOwnsSite = !!(_u && _u.role !== 'god' &&
@@ -78 +78 @@
   const canSeeBeheer = !!(_u && (_role === 'god' || _role === 'admin' || _role === 'kijker' || userOwnsSite));
 
-  // Interface-taal (bezoeker-instelbaar): sessie-keuze → browser-taal → nl.
-  const _lang = resolveLang(req);
+  // Interface-taal: sessie-keuze (deze sessie) → eigen voorkeur van de ingelogde
+  // gebruiker (users.lang) → admin-ingestelde standaard (Beheer) → env → browser → nl.
+  const _lang = resolveLang(req, {
+    userLang: _u && _u.lang,
+    defaultLang: getSetting('default_lang'),
+  });
 
   // Common locals