3 files changed, 20 insertions, 32 deletions
diff --git a/ui/src/admin/import.rs b/ui/src/admin/import.rs
index 1233c7d..805d787 100644
--- a/ui/src/admin/import.rs
+++ b/ui/src/admin/import.rs
@@ -4,11 +4,7 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use crate::{
-    FlashM, Page,
-    locale::{Language, tr, trs},
-    scaffold::FlashDisplay,
-};
+use crate::{FlashM, Page, locale::tr, scaffold::{FlashDisplay, RenderInfo}};
 use jellycommon::routes::u_admin_import_post;
 
 impl Page for AdminImportPage<'_> {
@@ -21,18 +17,18 @@ impl Page for AdminImportPage<'_> {
 }
 
 markup::define!(
-    AdminImportPage<'a>(lang: &'a Language, busy: bool, last_import_err: &'a [String], flash: &'a FlashM) {
+    AdminImportPage<'a>(ri: &'a RenderInfo<'a>, busy: bool, last_import_err: &'a [String], flash: &'a FlashM) {
         @FlashDisplay { flash }
         @if *busy {
-            h1 { @trs(lang, "admin.import.running") }
+            h1 { @tr(ri.lang, "admin.import.running") }
             noscript { "Live import progress needs javascript." }
             div[id="admin_import"] {}
         } else {
-            h1 { @trs(lang, "admin.import.title") }
+            h1 { @tr(ri.lang, "admin.import.title") }
             @if !last_import_err.is_empty() {
                 section.message.error {
                     details {
-                        summary { p.error { @tr(**lang, "admin.import_errors").replace("{n}", &last_import_err.len().to_string()) } }
+                        summary { p.error { @tr(ri.lang, "admin.import_errors").replace("{n}", &last_import_err.len().to_string()) } }
                         ol { @for e in *last_import_err {
                             li.error { pre.error { @e } }
                         }}
@@ -40,10 +36,10 @@ markup::define!(
                 }
             }
             form[method="POST", action=u_admin_import_post(true)] {
-                input[type="submit", value=tr(**lang, "admin.dashboard.import.inc").to_string()];
+                input[type="submit", value=tr(ri.lang, "admin.dashboard.import.inc").to_string()];
             }
             form[method="POST", action=u_admin_import_post(false)] {
-                input[type="submit", value=tr(**lang, "admin.dashboard.import.full").to_string()];
+                input[type="submit", value=tr(ri.lang, "admin.dashboard.import.full").to_string()];
             }
         }
     }
diff --git a/ui/src/admin/mod.rs b/ui/src/admin/mod.rs
index 632bcd4..f42ba76 100644
--- a/ui/src/admin/mod.rs
+++ b/ui/src/admin/mod.rs
@@ -8,11 +8,7 @@ pub mod import;
 pub mod log;
 pub mod user;
 
-use crate::{
-    FlashM, Page,
-    locale::{Language, tr, trs},
-    scaffold::FlashDisplay,
-};
+use crate::{FlashM, Page, locale::tr, scaffold::{FlashDisplay, RenderInfo}};
 use jellycommon::routes::{
     u_admin_import, u_admin_invite_create, u_admin_invite_remove, u_admin_log,
     u_admin_update_search, u_admin_users,
@@ -28,33 +24,33 @@ impl Page for AdminDashboardPage<'_> {
 }
 
 markup::define!(
-    AdminDashboardPage<'a>(lang: &'a Language, busy: Option<&'static str>, flash: &'a FlashM, invites: &'a [String]) {
-        h1 { @trs(lang, "admin.dashboard.title") }
+    AdminDashboardPage<'a>(ri: &'a RenderInfo<'a>, busy: Option<&'static str>, flash: &'a FlashM, invites: &'a [String]) {
+        h1 { @tr(ri.lang, "admin.dashboard.title") }
         @FlashDisplay { flash }
         ul {
-            li{a[href=u_admin_log(true)] { @trs(lang, "admin.log.warnonly") }}
-            li{a[href=u_admin_log(false)] { @trs(lang, "admin.log.full") }}
+            li{a[href=u_admin_log(true)] { @tr(ri.lang, "admin.log.warnonly") }}
+            li{a[href=u_admin_log(false)] { @tr(ri.lang, "admin.log.full") }}
         }
 
-        a[href=u_admin_import()] { h2 { @trs(lang, "admin.import.title") }}
+        a[href=u_admin_import()] { h2 { @tr(ri.lang, "admin.import.title") }}
         @if let Some(text) = busy {
             section.message { p.warn { @text } }
         }
         form[method="POST", action=u_admin_update_search()] {
-            input[type="submit", value=tr(**lang, "admin.dashboard.update_search").to_string()];
+            input[type="submit", value=tr(ri.lang, "admin.dashboard.update_search").to_string()];
         }
-        h2 { @trs(lang, "admin.dashboard.users") }
-        p { a[href=u_admin_users()] { @trs(lang, "admin.dashboard.manage_users") } }
-        h2 { @trs(lang, "admin.dashboard.invites") }
+        h2 { @tr(ri.lang, "admin.dashboard.users") }
+        p { a[href=u_admin_users()] { @tr(ri.lang, "admin.dashboard.manage_users") } }
+        h2 { @tr(ri.lang, "admin.dashboard.invites") }
         form[method="POST", action=u_admin_invite_create()] {
-            input[type="submit", value=tr(**lang, "admin.dashboard.create_invite").to_string()];
+            input[type="submit", value=tr(ri.lang, "admin.dashboard.create_invite").to_string()];
         }
         ul { @for t in *invites {
             li {
                 form[method="POST", action=u_admin_invite_remove()] {
                     span { @t }
                     input[type="text", name="invite", value=&t, hidden];
-                    input[type="submit", value=tr(**lang, "admin.dashboard.create_invite").to_string()];
+                    input[type="submit", value=tr(ri.lang, "admin.dashboard.create_invite").to_string()];
                 }
             }
         }}
diff --git a/ui/src/admin/user.rs b/ui/src/admin/user.rs
index a582d41..e4a8975 100644
--- a/ui/src/admin/user.rs
+++ b/ui/src/admin/user.rs
@@ -4,11 +4,7 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use crate::{
-    FlashM, Page,
-    locale::{Language, trs},
-    scaffold::FlashDisplay,
-};
+use crate::{FlashM, Page, scaffold::FlashDisplay};
 use jellycommon::routes::{
     u_admin_user, u_admin_user_permission, u_admin_user_remove, u_admin_users,
 };