@saltcorn/server 1.1.4-beta.2 → 1.1.4-beta.5

package/locales/de.json

@@ -1235,7 +1235,7 @@
   "Secondary outline button": "Sekundärer Umrissknopf",
   "Standard": "Standard",
   "X-Small": "X-Klein",
-  "Block": "Block",
+  "Block": "Blockieren",
   "Large block": "Großer Block",
   "Formula for JavaScript object that will be added to state parameters": "Formel für ein JavaScript-Objekt, das zu den Statusparametern hinzugefügt wird.",
   "Alignment": "Ausrichtung",
@@ -1584,5 +1584,23 @@
   "Manage tags...": "Tags verwalten...",
   "Started": "Gestartet",
   "Updated": "Aktualisiert",
-  "Status": "Status"
+  "Status": "Status",
+  "Working directory": "Arbeitsverzeichnis",
+  "Row click event": "Zeilenklick-Ereignis",
+  "What happens when a row is clicked": "Was passiert, wenn eine Zeile angeklickt wird?",
+  "Row click action": "Zeilenklickaktion",
+  "Run this action when row is clicked": "Führe diese Aktion aus, wenn die Zeile angeklickt wird.",
+  "Reset password view": "Passwort-Zurücksetzen-Ansicht",
+  "A view that will be emailed to users when they have forgotten their password": "Eine Ansicht, die an Benutzer gesendet wird, wenn sie ihr Passwort vergessen haben.",
+  "Allow login methods": "Login-Methoden erlauben",
+  "Inherit configuration values": "Konfigurationswerte erben",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Kommagetrennte Liste von Konfigurationseinstellungen, die Mieter vom Root erben. Bsp.: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "CSRF-Routen deaktivieren",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Durch Kommas getrennte Liste relativer URL-Routen, bei denen die CSRF-Token-Überprüfung deaktiviert ist. Beispiel: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Nur Tag",
+  "Language CSV": "Sprache CSV",
+  "Upload language CSV": "Sprach-CSV hochladen",
+  "Create an account!": "Erstellen Sie ein Konto!",
+  "Login with %s": "Mit %s anmelden",
+  "Already have an account? Login!": "Bereits ein Konto? Einloggen!"
 }

package/locales/en.json

@@ -1595,5 +1595,11 @@
 	"Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>",
 	"Only day": "Only day",
 	"Language CSV": "Language CSV",
-	"Upload language CSV": "Upload language CSV"
+	"Upload language CSV": "Upload language CSV",
+	"Create an account!": "Create an account!",
+	"Login with %s": "Login with %s",
+	"Already have an account? Login!": "Already have an account? Login!",
+	"Translated %s strings. Click 'Translate with LLM' again to continue": "Translated %s strings. Click 'Translate with LLM' again to continue",
+	"Translate with LLM": "Translate with LLM",
+	"You may need to adjust view relations associated with this table after renaming it": "You may need to adjust view relations associated with this table after renaming it"
 }

package/locales/es.json

@@ -1332,7 +1332,7 @@
   "width": "ancho",
   "height": "altura",
   "innerWidth": "innerWidth",
-  "innerHeight": "innerHeight",
+  "innerHeight": "interiorAlto",
   "Screen info added": "Información de pantalla agregada",
   "Screen info removed": "Información de pantalla eliminada",
   "Edit screen info": "Editar información de pantalla",
@@ -1584,5 +1584,23 @@
   "Manage tags...": "Administrar etiquetas...",
   "Started": "Iniciado",
   "Updated": "Actualizado",
-  "Status": "Estado"
+  "Status": "Estado",
+  "Working directory": "Directorio de trabajo",
+  "Row click event": "Evento de clic en fila",
+  "What happens when a row is clicked": "¿Qué sucede cuando se hace clic en una fila?",
+  "Row click action": "Acción de clic en fila",
+  "Run this action when row is clicked": "Ejecutar esta acción cuando se haga clic en la fila.",
+  "Reset password view": "Vista de restablecimiento de contraseña",
+  "A view that will be emailed to users when they have forgotten their password": "Una vista que se enviará por correo electrónico a los usuarios cuando hayan olvidado su contraseña.",
+  "Allow login methods": "Permitir métodos de inicio de sesión",
+  "Inherit configuration values": "Heredar valores de configuración",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Lista separada por comas de configuraciones que los inquilinos heredan de la raíz. Ej: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Desactivar rutas CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Lista separada por comas de rutas de URL relativas donde la verificación del token CSRF está deshabilitada. Ejemplo: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Solo día",
+  "Language CSV": "CSV de idioma",
+  "Upload language CSV": "Subir CSV de idiomas",
+  "Create an account!": "¡Crear una cuenta!",
+  "Login with %s": "Iniciar sesión con %s",
+  "Already have an account? Login!": "¿Ya tienes una cuenta? ¡Inicia sesión!"
 }

package/locales/fr.json

@@ -150,7 +150,7 @@
   "Version %s restored": "Version %s restorée",
   "Site name": "Nom du site",
   "Site logo": "Logo du site",
-  "Type": "Type",
+  "Type": "Taper",
   "Text label": "Étiquette de texte",
   "Minimum role": "Rôle minimum",
   "URL": "URL",
@@ -970,7 +970,7 @@
   "Entry point": "Point d'entrée",
   "Platform": "Plateforme",
   "docker": "Docker",
-  "android": "android",
+  "android": "Android",
   "iOS": "iOS",
   "App file": "Fichier d'application",
   "Server URL": "URL du serveur",
@@ -1579,5 +1579,23 @@
   "Manage tags...": "Gérer les étiquettes...",
   "Started": "Commencé",
   "Updated": "Mis à jour",
-  "Status": "Statut"
+  "Status": "Statut",
+  "Working directory": "Répertoire de travail",
+  "Row click event": "Événement de clic sur la ligne",
+  "What happens when a row is clicked": "Que se passe-t-il lorsqu'une ligne est cliquée ?",
+  "Row click action": "Action de clic sur une ligne",
+  "Run this action when row is clicked": "Exécuter cette action lorsque la ligne est cliquée.",
+  "Reset password view": "Vue de réinitialisation du mot de passe",
+  "A view that will be emailed to users when they have forgotten their password": "Une vue qui sera envoyée par e-mail aux utilisateurs lorsqu'ils ont oublié leur mot de passe.",
+  "Allow login methods": "Autoriser les méthodes de connexion",
+  "Inherit configuration values": "Hériter des valeurs de configuration",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Liste séparée par des virgules des paramètres de configuration que les locataires héritent de la racine. Ex : <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Désactiver les routes CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Liste de routes URL relatives séparées par des virgules où la vérification du jeton CSRF est désactivée. Exemple : <code>/files/upload, /auth/signup</code>",
+  "Only day": "Seulement le jour",
+  "Language CSV": "Langage CSV",
+  "Upload language CSV": "Télécharger le fichier CSV de langue",
+  "Create an account!": "Créer un compte !",
+  "Login with %s": "Connectez-vous avec %s",
+  "Already have an account? Login!": "Vous avez déjà un compte ? Connectez-vous !"
 }

package/locales/pl.json

@@ -969,7 +969,7 @@
   "Diagram": "Diagram",
   "Entry point": "Punkt początkowy",
   "Platform": "Platforma",
-  "docker": "docker",
+  "docker": "Docker",
   "android": "Android",
   "iOS": "iOS",
   "App file": "Plik aplikacji",
@@ -1583,12 +1583,22 @@
   "Started": "Rozpoczęto",
   "Updated": "Zaktualizowano",
   "Status": "Status",
-  "Working directory": "Katalog roboczy",  
-  "Row click event": "Zdarzenie kliknięcia w wiersz",  
-  "What happens when a row is clicked": "Co się dzieje po kliknięciu wiersz",  
-  "Row click action": "Akcja po kliknięciu wiersza",  
-  "Run this action when row is clicked": "Wykonaj tę akcję po kliknięciu wiersza",  
-  "Reset password view": "Widok resetowania hasła",  
-  "A view that will be emailed to users when they have forgotten their password": "Widok, który zostanie wysłany e-mailem do użytkowników, gdy zapomną hasła",  
-  "Allow login methods": "Zezwalaj na metody logowania" 
+  "Working directory": "Katalog roboczy",
+  "Row click event": "Zdarzenie kliknięcia w wiersz",
+  "What happens when a row is clicked": "Co się dzieje po kliknięciu wiersz",
+  "Row click action": "Akcja po kliknięciu wiersza",
+  "Run this action when row is clicked": "Wykonaj tę akcję po kliknięciu wiersza",
+  "Reset password view": "Widok resetowania hasła",
+  "A view that will be emailed to users when they have forgotten their password": "Widok, który zostanie wysłany e-mailem do użytkowników, gdy zapomną hasła",
+  "Allow login methods": "Zezwalaj na metody logowania",
+  "Inherit configuration values": "Dziedziczenie wartości konfiguracji",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Lista ustawień konfiguracyjnych oddzielonych przecinkami, które dzierżawcy dziedziczą z głównego. Przykład: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Wyłącz trasy CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Lista rozdzielona przecinkami względnych tras URL, gdzie sprawdzanie tokena CSRF jest wyłączone. Przykład: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Tylko dzień",
+  "Language CSV": "Język CSV",
+  "Upload language CSV": "Prześlij plik CSV z językiem",
+  "Create an account!": "Utwórz konto!",
+  "Login with %s": "Zaloguj się za pomocą %s",
+  "Already have an account? Login!": "Masz już konto? Zaloguj się!"
 }

package/locales/pt.json

@@ -969,7 +969,7 @@
   "Entry point": "Ponto de entrada",
   "Platform": "Plataforma",
   "docker": "docker",
-  "android": "android",
+  "android": "Android",
   "iOS": "iOS",
   "App file": "Arquivo de aplicativo",
   "Server URL": "URL do servidor",
@@ -1579,5 +1579,23 @@
   "Manage tags...": "Gerenciar etiquetas...",
   "Started": "Iniciado",
   "Updated": "Atualizado",
-  "Status": "Status"
+  "Status": "Estado",
+  "Working directory": "Diretório de trabalho",
+  "Row click event": "Evento de clique na linha",
+  "What happens when a row is clicked": "O que acontece quando uma linha é clicada?",
+  "Row click action": "Ação de clique na linha",
+  "Run this action when row is clicked": "Execute esta ação quando a linha for clicada.",
+  "Reset password view": "Visualização de redefinição de senha",
+  "A view that will be emailed to users when they have forgotten their password": "Uma visualização que será enviada por email aos usuários quando eles esquecerem sua senha.",
+  "Allow login methods": "Permitir métodos de login",
+  "Inherit configuration values": "Herdar valores de configuração",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Lista separada por vírgulas de configurações que os inquilinos herdam da raiz. Ex: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Desativar rotas CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Lista separada por vírgulas de rotas de URL relativas onde a verificação do token CSRF está desativada. Exemplo: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Apenas dia",
+  "Language CSV": "CSV de Idiomas",
+  "Upload language CSV": "Carregar CSV de idioma",
+  "Create an account!": "Crie uma conta!",
+  "Login with %s": "Entrar com %s",
+  "Already have an account? Login!": "Já tem uma conta? Faça login!"
 }

package/markup/expression_blurb.js

@@ -20,7 +20,7 @@ const toJsType = (type) =>
     Date: "Date class",
     String: "string",
     Color: "string",
-  }[type] || type);
+  })[type] || type;
 
 /**
  * @param {string} type
@@ -31,7 +31,9 @@ const toJsType = (type) =>
  */
 const expressionBlurb = (type, stored, table, req) => {
   const allFields = table.fields;
-  const fields = allFields.filter((f) => !f.calculated);
+  const fields = stored
+    ? allFields.filter((f) => !f.stored || f.expression === "__aggregation")
+    : allFields.filter((f) => !f.calculated);
   const funs = getState().functions;
   const funNames = Object.entries(funs)
     .filter(([k, v]) => !(!stored && v.isAsync))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.4-beta.2",
+  "version": "1.1.4-beta.5",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.4-beta.2",
-    "@saltcorn/builder": "1.1.4-beta.2",
-    "@saltcorn/data": "1.1.4-beta.2",
-    "@saltcorn/admin-models": "1.1.4-beta.2",
-    "@saltcorn/filemanager": "1.1.4-beta.2",
-    "@saltcorn/markup": "1.1.4-beta.2",
-    "@saltcorn/plugins-loader": "1.1.4-beta.2",
-    "@saltcorn/sbadmin2": "1.1.4-beta.2",
+    "@saltcorn/base-plugin": "1.1.4-beta.5",
+    "@saltcorn/builder": "1.1.4-beta.5",
+    "@saltcorn/data": "1.1.4-beta.5",
+    "@saltcorn/admin-models": "1.1.4-beta.5",
+    "@saltcorn/filemanager": "1.1.4-beta.5",
+    "@saltcorn/markup": "1.1.4-beta.5",
+    "@saltcorn/plugins-loader": "1.1.4-beta.5",
+    "@saltcorn/sbadmin2": "1.1.4-beta.5",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -1294,7 +1294,13 @@ function initialize_page() {
       });
     }
   });
-}
+
+  $('input[type="file"].file-has-existing').on("change", (e) => {
+    const $elem = $(e.target);
+    $elem.removeClass("file-has-existing");
+    $elem.parent().find("span.file-upload-exising").remove();
+  });
+} //initialize_page
 
 $(initialize_page);
 
@@ -1769,7 +1775,7 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
   }
 }
 
-function editAllowedAuthByRole(id, event) {  
+function editAllowedAuthByRole(id, event) {
   ajax_post_json(
     `/roleadmin/setrole_allowed_auth_methods/${id}`,
     {
@@ -2238,7 +2244,7 @@ function handle_identical_fields(event) {
         });
     } else if (tagName === "INPUT") {
       form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
-        input.value = newValue;
+        if (input.type !== "file") input.value = newValue;
       });
     }
   }

package/public/saltcorn.css

@@ -818,5 +818,15 @@ tr:hover span.add-tag {
 }
 
 #saltcorn-file-manager .filelist tr.selected td {
-  background-color: var(--bs-secondary-bg-subtle, var(--tblr-secondary-bg-subtle, gray));;
+  background-color: var(
+    --bs-secondary-bg-subtle,
+    var(--tblr-secondary-bg-subtle, gray)
+  );
+}
+
+input[type="file"].file-has-existing {
+  font-size: 0;
+}
+::file-selector-button {
+  font-size: initial;
 }

package/routes/common_lists.js

@@ -284,7 +284,7 @@ const tagsDropdown = (tags, altHeader, req) =>
         {
           class: "dropdown-item",
           // TODO check url why view for page, what do we need for page group
-          href: `tag`,
+          href: `/tag`,
         },
         req.__("Manage tags...")
       )
@@ -391,7 +391,7 @@ const viewsList = async (
                   filterOnTag ? `Tag:${filterOnTag.name}` : undefined,
                   req
                 ),
-                key: (r) => tagBadges(r),
+                key: (r) => (r.id ? tagBadges(r) : ""),
               },
             ]),
         {

package/routes/infoarch.js

@@ -25,6 +25,7 @@ const Form = require("@saltcorn/data/models/form");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
 const { stringify } = require("csv-stringify");
 const csvtojson = require("csvtojson");
+const { hasLLM, translate } = require("@saltcorn/data/translate");
 
 /**
  * @type {object}
@@ -340,7 +341,21 @@ router.get(
         above: [
           {
             type: "card",
-            contents: [renderForm(form, req.csrfToken())],
+            contents: [
+              renderForm(form, req.csrfToken()),
+              hasLLM() &&
+                renderForm(
+                  new Form({
+                    fields: [],
+                    action: `/site-structure/localizer/translate-llm/${lang}`,
+                    submitLabel: req.__("Translate with LLM"),
+                    onSubmit: "press_store_button(this)",
+
+                    submitButtonClass: "btn-secondary",
+                  }),
+                  req.csrfToken()
+                ),
+            ],
           },
           !is_default && {
             type: "card",
@@ -375,6 +390,55 @@ router.get(
   })
 );
 
+router.post(
+  "/localizer/translate-llm/:lang/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { lang, defstring } = req.params;
+    if (
+      lang === "__proto__" ||
+      defstring === "__proto__" ||
+      lang === "constructor"
+    ) {
+      res.redirect(`/`);
+      return;
+    }
+    const cfgLangs = getState().getConfig("localizer_languages");
+
+    if (!cfgLangs[lang]) {
+      req.flash("error", req.__("Language not found"));
+      return res.redirect(`/site-structure/localizer`);
+    }
+    const default_lang =
+      Object.values(cfgLangs).find((lobj) => lobj.is_default)?.locale ||
+      getState().getConfig("default_locale", "en");
+    let count = 0;
+    for (const defstring of getState().getStringsForI18n()) {
+      const cfgStrings = getState().getConfigCopy("localizer_strings", {});
+      if (
+        cfgStrings[lang][defstring] &&
+        cfgStrings[lang][defstring] !== defstring
+      )
+        continue;
+      if (count >= 20) break;
+      count += 1;
+      const translated = await translate(defstring, lang, default_lang);
+      if (cfgStrings[lang]) cfgStrings[lang][defstring] = translated;
+      else cfgStrings[lang] = { [defstring]: translated };
+      await getState().setConfig("localizer_strings", cfgStrings);
+    }
+    if (count == 20)
+      req.flash(
+        "success",
+        req.__(
+          `Translated %s strings. Click 'Translate with LLM' again to continue`, count
+        )
+      );
+    else req.flash("success", req.__(`Finished translating %s strings.`, count));
+    res.redirect(`/site-structure/localizer/edit/${lang}`);
+  })
+);
+
 /**
  * @name post/localizer/save-string/:lang/:defstring
  * @function

package/routes/list.js

@@ -417,9 +417,7 @@ router.get(
                   pagination:true,
                   paginationMode:"remote",
                   paginationSize:20,
-                  clipboard:true,
-                  persistence:true, 
-                  persistenceID:"table_tab_${table.name}",
+                  clipboard:true,                 
                   movableColumns: true,
                   ajaxContentType:"json",
                   sortMode:"remote",

package/routes/tables.js

@@ -1902,7 +1902,9 @@ router.post(
 const renameForm = (table_id, req) =>
   new Form({
     action: `/table/rename/${table_id}`,
-    labelCols: 3,
+    blurb: req.__(
+      "You may need to adjust view relations associated with this table after renaming it"
+    ),
     fields: [
       {
         name: "name",
@@ -1910,6 +1912,14 @@ const renameForm = (table_id, req) =>
         type: "String",
       },
     ],
+    additionalButtons: [
+      {
+        label: req.__("Cancel"),
+        class: "btn btn-danger",
+        onclick: "history.back()",
+      },
+    ],
+    values: { name: Table.findOne({ id: table_id })?.name },
   });
 
 /**

package/routes/tag_entries.js

@@ -7,6 +7,7 @@ const {
   label,
   text,
 } = require("@saltcorn/markup/tags");
+const db = require("@saltcorn/data/db");
 
 const Tag = require("@saltcorn/data/models/tag");
 const TagEntry = require("@saltcorn/data/models/tag_entry");
@@ -192,7 +193,11 @@ router.post(
     const fieldName = idField(entitytype);
     const auth = checkEditPermission(entitytype, req.user);
     if (!auth) req.flash("error", "Not authorized");
-    else await tag.addEntry({ [fieldName]: +entityid });
+    else
+      await db.withTransaction(async () => {
+        await tag.addEntry({ [fieldName]: +entityid });
+      });
+
     let redirectTarget =
       req.query.on_done_redirect &&
       is_relative_url("/" + req.query.on_done_redirect)

package/routes/view.js

@@ -77,13 +77,20 @@ router.get(
     const isModal = req.headers?.saltcornmodalrequest;
 
     const contents0 = await view.run_possibly_on_page(query, req, res);
+    const __ = (s) =>
+      state.i18n.__({ phrase: s, locale: req.getLocale() }) || s;
     let title =
       isModal && view.attributes?.popup_title
-        ? view.attributes?.popup_title
-        : view.attributes?.page_title ||
+        ? __(view.attributes?.popup_title)
+        : __(view.attributes?.page_title) ||
           scan_for_page_title(contents0, view.name); //legacy
     if ((title || "").includes("{{")) {
-      title = await view.interpolate_title_string(title, query);
+      try {
+        title = await view.interpolate_title_string(title, query);
+      } catch (e) {
+        console.error(e);
+        title = e?.message || e;
+      }
     }
     title = { title };
     if (isModal && view.attributes?.popup_width)

package/wrapper.js

@@ -324,10 +324,13 @@ const get_headers = (req, version_tag, description, extras = []) => {
  * @param state
  * @returns {{name: *, logo: (string|undefined)}}
  */
-const get_brand = (state) => {
+const get_brand = (state, req) => {
   const logo_id = state.getConfig("site_logo_id", "");
+  const locale = req.getLocale();
+  const __ = (s) => state.i18n.__({ phrase: s, locale }) || s;
+  const name = __(state.getConfig("site_name", "Saltcorn"));
   return {
-    name: state.getConfig("site_name"),
+    name,
     logo: logo_id && logo_id !== "0" ? `/files/serve/${logo_id}` : undefined,
   };
 };
@@ -352,7 +355,7 @@ module.exports = (version_tag) =>
             form,
             authLinks,
             afterForm: html.length === 1 ? html[0] : html.join(""),
-            brand: get_brand(state),
+            brand: get_brand(state, req),
             menu: get_menu(req),
             alerts: getFlashes(req),
             headers: get_headers(req, version_tag),
@@ -382,7 +385,7 @@ module.exports = (version_tag) =>
         res.send(
           layout.wrap({
             title,
-            brand: get_brand(state),
+            brand: get_brand(state, req),
             menu: get_menu(req),
             currentUrl,
             originalUrl: req.originalUrl,
@@ -436,7 +439,7 @@ module.exports = (version_tag) =>
       res.send(
         layout.wrap({
           title,
-          brand: no_menu ? undefined : get_brand(state),
+          brand: no_menu ? undefined : get_brand(state, req),
           menu: no_menu ? undefined : get_menu(req),
           currentUrl,
           originalUrl: req.originalUrl,