more ui refactor

1 files changed, 7 insertions, 11 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()];
             }
         }
     }