translate settings, login and register pages

1 files changed, 49 insertions, 31 deletions

diff --git a/server/src/routes/ui/account/mod.rs b/server/src/routes/ui/account/mod.rs
index 6139a08..83a1447 100644
--- a/server/src/routes/ui/account/mod.rs
+++ b/server/src/routes/ui/account/mod.rs
@@ -6,19 +6,25 @@
 pub mod session;
 pub mod settings;
 
-use super::{error::MyError, layout::LayoutPage};
+use super::{
+    error::MyError,
+    layout::{trs, LayoutPage},
+};
 use crate::{
     database::Database,
-    routes::ui::{
-        account::session::Session, error::MyResult, home::rocket_uri_macro_r_home,
-        layout::DynLayoutPage,
+    routes::{
+        locale::AcceptLanguage,
+        ui::{
+            account::session::Session, error::MyResult, home::rocket_uri_macro_r_home,
+            layout::DynLayoutPage,
+        },
     },
     uri,
 };
 use anyhow::anyhow;
 use argon2::{password_hash::Salt, Argon2, PasswordHasher};
 use chrono::Duration;
-use jellybase::CONF;
+use jellybase::{locale::tr, CONF};
 use jellycommon::user::{User, UserPermission};
 use rocket::{
     form::{Contextual, Form},
@@ -42,24 +48,25 @@ pub struct RegisterForm {
 }
 
 #[get("/account/register")]
-pub async fn r_account_register() -> DynLayoutPage<'static> {
+pub async fn r_account_register(lang: AcceptLanguage) -> DynLayoutPage<'static> {
+    let AcceptLanguage(lang) = lang;
     LayoutPage {
-        title: "Register".to_string(),
+        title: tr(lang, "account.register").to_string(),
         content: markup::new! {
             form.account[method="POST", action=""] {
-                h1 { "Register"  }
+                h1 { @trs(&lang, "account.register") }
 
-                label[for="inp-invitation"] { "Invite Code" }
+                label[for="inp-invitation"] { @trs(&lang, "account.register.invitation") }
                 input[type="text", id="inp-invitation", name="invitation"]; br;
 
-                label[for="inp-username"] { "Username" }
+                label[for="inp-username"] { @trs(&lang, "account.username") }
                 input[type="text", id="inp-username", name="username"]; br;
-                label[for="inp-password"] { "Password" }
+                label[for="inp-password"] { @trs(&lang, "account.password") }
                 input[type="password", id="inp-password", name="password"]; br;
 
-                input[type="submit", value="Register now!"];
+                input[type="submit", value=&*tr(lang, "account.register.submit")];
 
-                p { "Already have an account? " a[href=uri!(r_account_login())] { "Login here" } }
+                p { @trs(&lang, "account.register.login") " " a[href=uri!(r_account_login())] { @trs(&lang, "account.register.login_here") } }
             }
         },
         ..Default::default()
@@ -77,27 +84,35 @@ pub struct LoginForm {
 }
 
 #[get("/account/login")]
-pub fn r_account_login(sess: Option<Session>) -> DynLayoutPage<'static> {
+pub fn r_account_login(sess: Option<Session>, lang: AcceptLanguage) -> DynLayoutPage<'static> {
+    let AcceptLanguage(lang) = lang;
     let logged_in = sess.is_some();
-    let title = if logged_in { "Switch Account" } else { "Login" };
+    let title = tr(
+        lang,
+        if logged_in {
+            "account.login.switch"
+        } else {
+            "account.login"
+        },
+    );
     LayoutPage {
         title: title.to_string(),
         content: markup::new! {
             form.account[method="POST", action=""] {
-                h1 { @title }
+                h1 { @title.to_string() }
 
-                label[for="inp-username"] { "Username" }
+                label[for="inp-username"] { @trs(&lang, "account.username") }
                 input[type="text", id="inp-username", name="username"]; br;
-                label[for="inp-password"] { "Password" }
+                label[for="inp-password"] { @trs(&lang, "account.password") }
                 input[type="password", id="inp-password", name="password"]; br;
 
-                input[type="submit", value=title];
+                input[type="submit", value=&*tr(lang, if logged_in { "account.login.submit.switch" } else { "account.login.submit" })];
 
                 @if logged_in {
-                    p { "Need another account? " a[href=uri!(r_account_register())] { "Register here" } }
+                    p { @trs(&lang, "account.login.register.switch") " " a[href=uri!(r_account_register())] { @trs(&lang, "account.login.register_here") } }
                 } else {
-                    p { "While logged in, a cookie will be used to identify you." }
-                    p { "Don't have an account yet? " a[href=uri!(r_account_register())] { "Register here" } }
+                    p { @trs(&lang, "account.login.cookie_note") }
+                    p { @trs(&lang, "account.login.register") " " a[href=uri!(r_account_register())] { @trs(&lang, "account.login.register_here") } }
                 }
             }
         },
@@ -106,13 +121,14 @@ pub fn r_account_login(sess: Option<Session>) -> DynLayoutPage<'static> {
 }
 
 #[get("/account/logout")]
-pub fn r_account_logout() -> DynLayoutPage<'static> {
+pub fn r_account_logout(lang: AcceptLanguage) -> DynLayoutPage<'static> {
+    let AcceptLanguage(lang) = lang;
     LayoutPage {
-        title: "Log out".to_string(),
+        title: tr(lang, "account.logout").to_string(),
         content: markup::new! {
             form.account[method="POST", action=""] {
-                h1 { "Log out" }
-                input[type="submit", value="Log out."];
+                h1 { @trs(&lang, "account.logout") }
+                input[type="submit", value=&*tr(lang, "account.logout.submit")];
             }
         },
         ..Default::default()
@@ -124,7 +140,9 @@ pub fn r_account_register_post<'a>(
     database: &'a State<Database>,
     _sess: Option<Session>,
     form: Form<Contextual<'a, RegisterForm>>,
+    lang: AcceptLanguage,
 ) -> MyResult<DynLayoutPage<'a>> {
+    let AcceptLanguage(lang) = lang;
     let logged_in = _sess.is_some();
     let form = match &form.value {
         Some(v) => v,
@@ -143,13 +161,13 @@ pub fn r_account_register_post<'a>(
     )?;
 
     Ok(LayoutPage {
-        title: "Registration successful".to_string(),
+        title: tr(lang, "account.register.success.title").to_string(),
         content: markup::new! {
-            h1 { @if logged_in {
-                "Registration successful, you may switch account now."
+            h1 { @trs(&lang, if logged_in {
+                "account.register.success.switch"
             } else {
-                "Registration successful, you may log in now."
-            }}
+                "account.register.success"
+            })}
         },
         ..Default::default()
     })