uhhm/portal
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 89 Wiki Activity

Chrome speaks the site's language: site.yaml lang + i18n table

Browse Source 
The strings the portal itself says - Asked by, Also worth asking,
Sign in, the not-found page, defaults - translate via a small en/no
table selected by site.yaml's lang, which also sets the html lang
attribute. Content keeps speaking for itself; unknown languages fall
back to English per key.

Also: a scheme-gated markdown image now swallows its alt text instead
of leaking it as stray text - this is the fix for the test that has
been red since 0.3.19 (publish is tag-triggered and does not gate on
the test workflow; caught late).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ
This commit is contained in:
Bendik Aagaard Lynghaug
2026-09-01 17:23:28 +02:00
co-authored by Claude Fable 5
parent 528e2badaf
commit b259bf39bb
4 changed files with 145 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app.rs
+34 -14
View File
@@ -1,5 +1,5 @@
use leptos::prelude::*;
use leptos_meta::{provide_meta_context, HashedStylesheet, MetaTags, Title};
use leptos_meta::{provide_meta_context, HashedStylesheet, Html, MetaTags, Title};
use leptos_router::{
components::{Route, Router, Routes},
hooks::{use_location, use_navigate, use_query_map},
@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
use crate::answers::{Answer, SelfTransitionAnswer, TransitionAnswers, TransitionItem};
use crate::auth::{current_user, User};
use crate::content::{is_qualified, render_inline_markdown, Alternative, Question, Responsible, SiteConfig, Transition};
use crate::i18n::t;
use crate::resource::{get_requirement_binding, get_requirement_options, get_resource};
/// The visible site name/wordmark - "portal" is just this codebase's
@@ -68,8 +69,18 @@ pub fn App() -> impl IntoView {
// context instead of fetching their own copy.
let site = Resource::new(|| (), |_| get_site());
provide_context(site);
// The chrome's language, from site.yaml (default "en"); content
// speaks for itself. Components read this via context for t().
let lang = Memo::new(move |_| {
site.get()
.and_then(|r| r.ok())
.and_then(|s| s.lang)
.unwrap_or_else(|| "en".to_string())
});
provide_context(Lang(lang));
view! {
<Html attr:lang=move || lang.get()/>
<Suspense fallback=|| ()>
{move || {
site.get()
@@ -88,6 +99,15 @@ pub fn App() -> impl IntoView {
}
}
/// The site's chrome language as a context signal - see App.
#[derive(Clone, Copy)]
pub struct Lang(pub Memo<String>);
/// The current chrome language, for `t()` calls inside views.
fn lang() -> Memo<String> {
expect_context::<Lang>().0
}
/// Every server-fn resource the pages read, created exactly once for
/// the app's lifetime and handed down via context. Wrapper structs
/// because a bare `Resource<T>` context is claimed by whoever provides
@@ -241,7 +261,7 @@ fn QuestionView(
/>
<div class="alternatives">
<section class="alt-card gate-card">
<p>"This page follows from an answer you don't seem to carry yet."</p>
<p>{move || t(&lang().get(), "follows_answer")}</p>
<a class="alt-submit" href=target>
{label}
</a>
@@ -269,7 +289,7 @@ fn QuestionView(
<div class="alternatives">
<section class="alt-card gate-card">
{if signed_in {
view! { <p>"This part of the site is for organizational owners — sign in with that account to take a look."</p> }
view! { <p>{move || t(&lang().get(), "owners_only")}</p> }
.into_any()
} else {
view! {
@@ -278,7 +298,7 @@ fn QuestionView(
href=format!("/auth/login?redirect={question_id}")
rel="external"
>
"Sign in"
{move || t(&lang().get(), "sign_in")}
</a>
}
.into_any()
@@ -371,7 +391,7 @@ fn QuestionNav(current_id: String, has_chain: bool) -> impl IntoView {
.collect();
(!others.is_empty()).then(|| view! {
<nav class="question-nav">
<span class="question-nav-lead">"Also worth asking"</span>
<span class="question-nav-lead">{move || t(&lang().get(), "also_worth_asking")}</span>
<For
each=move || others.clone()
key=|(id, _)| id.clone()
@@ -399,7 +419,7 @@ fn Announcements(current_id: String) -> impl IntoView {
let current_id = current_id.clone();
announcements.get().and_then(|res| res.ok()).map(|items| {
(!items.is_empty()).then(|| view! {
<nav class="announce" aria-label="Announcements">
<nav class="announce" aria-label=move || t(&lang().get(), "announcements")>
<For
each=move || items.clone()
key=|a| a.id.clone()
@@ -459,11 +479,11 @@ fn ResponsibleNote(responsible: Responsible) -> impl IntoView {
view! {
<small class="question-responsible">
"Asked by " {responsible.name.clone()} " — "
{move || t(&lang().get(), "asked_by")} {responsible.name.clone()} " — "
<a data-user=user data-domain=domain on:mouseover=assemble on:click=assemble>
"contact them"
{move || t(&lang().get(), "contact_them")}
</a>
" if you get stuck."
{move || t(&lang().get(), "if_stuck")}
</small>
}
}
@@ -741,7 +761,7 @@ fn AlternativeCard(
</button>
}
.into_any(),
Some(Ok(())) => view! { <p>"Done."</p> }.into_any(),
Some(Ok(())) => view! { <p>{move || t(&lang().get(), "done")}</p> }.into_any(),
Some(Err(e)) => view! { <p class="resource-error">{e.to_string()}</p> }.into_any(),
}
}}
@@ -936,7 +956,7 @@ fn AlternativeCard(
.consequence
.first()
.cloned()
.unwrap_or_else(|| "Send".to_string());
.unwrap_or_else(|| t(&lang().get(), "send").to_string());
view! {
<section class="alt-card">
@@ -1426,7 +1446,7 @@ fn ResourceFeature(
{move || {
let feature_name = feature_name.clone();
let transitions = transitions.clone();
let empty = empty.clone().unwrap_or_else(|| "Nothing here yet.".to_string());
let empty = empty.clone().unwrap_or_else(|| t(&lang().get(), "nothing_here_yet").to_string());
data.get()
.map(|res| match res {
Ok(value) => {
@@ -1895,8 +1915,8 @@ fn format_ms(ms: i64) -> String {
fn NotFound() -> impl IntoView {
view! {
<main class="not-found">
<h1>"Nothing here"</h1>
<a href="/">"back to the start"</a>
<h1>{move || t(&lang().get(), "nothing_here")}</h1>
<a href="/">{move || t(&lang().get(), "back_to_start")}</a>
</main>
}
}