add language

src/game.rs

@@ -1,6 +1,7 @@
-use crate::{page::new, Backend};
+use crate::{language::language, page::new, Backend};
 use axum::{
     extract::{Path, State},
+    http::HeaderMap,
     response::{IntoResponse, Redirect, Response},
     routing::get,
     Router,
@@ -10,14 +11,20 @@ use maud::{html, Markup, PreEscaped};
 use std::sync::Arc;
 use uuid::Uuid;
 
-async fn index(State(backend): State<Arc<Backend>>, cookies: CookieJar) -> Response {
+async fn index(
-    let (cookies, client) = backend.client(cookies).await;
+    State(backend): State<Arc<Backend>>,
+    cookies: CookieJar,
+    headers: HeaderMap,
+) -> Response {
+    let (cookies, req) = backend.client_full(cookies, &headers).await;
+    let client = req.client;
 
     let sightings = backend.sightings_for_client(&client).await;
     let amount_total_cameras = backend.amount_total_cameras().await;
     let highscore = backend.highscore().await;
 
-    let markup = new(html! {
+    let markup = new(
+        html! {
             hgroup {
                 h1 { "Who finds the most cameras?" }
             }
@@ -80,7 +87,9 @@ async fn index(State(backend): State<Arc<Backend>>, cookies: CookieJar) -> Respo
                     }
                 }
             }
-    });
+        },
+        req.lang,
+    );
 
     (cookies, markup).into_response()
 }
@@ -88,16 +97,17 @@ async fn index(State(backend): State<Arc<Backend>>, cookies: CookieJar) -> Respo
 async fn game(
     State(backend): State<Arc<Backend>>,
     cookies: CookieJar,
+    headers: HeaderMap,
     Path(uuid): Path<String>,
 ) -> Result<Redirect, Response> {
     let (cookies, client) = backend.client(cookies).await;
 
     let Ok(uuid) = Uuid::parse_str(&uuid) else {
-        return Err(not_found().await.into_response());
+        return Err(not_found(cookies, headers).await.into_response());
     };
 
     let Some(camera) = backend.get_camera(&uuid).await else {
-        return Err(not_found().await.into_response());
+        return Err(not_found(cookies, headers).await.into_response());
     };
 
     let succ = backend.client_found_camera(&client, &camera).await;
@@ -106,10 +116,14 @@ async fn game(
     Ok(Redirect::to("/game"))
 }
 
-async fn not_found() -> Markup {
+async fn not_found(cookies: CookieJar, headers: HeaderMap) -> Markup {
-    new(html! {
+    let lang = language(&cookies, &headers);
+    new(
+        html! {
             h1 { "uups" }
-    })
+        },
+        lang,
+    )
 }
 
 pub(super) fn routes() -> Router<Arc<Backend>> {

src/index.rs

@@ -8,7 +8,8 @@ pub(super) async fn index(cookies: CookieJar, headers: HeaderMap) -> Markup {
 
     rust_i18n::set_locale(lang.to_locale());
 
-    new(html! {
+    new(
+        html! {
             h1 { (t!("digital_shadows")) }
             hgroup {
                 h2 {
@@ -72,5 +73,7 @@ pub(super) async fn index(cookies: CookieJar, headers: HeaderMap) -> Markup {
                 }
               }
             }
-    })
+        },
+        lang,
+    )
 }

src/page.rs

@@ -1,8 +1,9 @@
+use crate::Language;
 use maud::{html, Markup, DOCTYPE};
 
 // TODO: set dynamic meta lang attribute
 
-pub fn new(content: Markup) -> Markup {
+pub fn new(content: Markup, lang: Language) -> Markup {
     html! {
         (DOCTYPE)
         head {