use RenderInfo guard everywhere and start to use FlashMessage

1 files changed, 5 insertions, 5 deletions

diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs
index 2a513a9..8296e95 100644
--- a/server/src/ui/account/mod.rs
+++ b/server/src/ui/account/mod.rs
@@ -46,8 +46,8 @@ pub async fn r_account_register(lang: AcceptLanguage) -> RawHtml<String> {
         RenderInfo {
             importing: false,
             session: None,
+            lang,
         },
-        lang,
     ))
 }
 
@@ -73,8 +73,8 @@ pub fn r_account_login(session: Option<A<Session>>, lang: AcceptLanguage) -> Raw
         RenderInfo {
             session: session.map(|s| SessionInfo { user: s.0.user }),
             importing: is_importing(),
+            lang,
         },
-        lang,
     ))
 }
 
@@ -86,16 +86,16 @@ pub fn r_account_logout(session: Option<A<Session>>, lang: AcceptLanguage) -> Ra
         RenderInfo {
             session: session.map(|s| SessionInfo { user: s.0.user }),
             importing: is_importing(),
+            lang,
         },
-        lang,
     ))
 }
 
 #[post("/account/register", data = "<form>")]
 pub fn r_account_register_post<'a>(
     session: Option<A<Session>>,
-    form: Form<Contextual<'a, RegisterForm>>,
     lang: AcceptLanguage,
+    form: Form<Contextual<'a, RegisterForm>>,
 ) -> MyResult<RawHtml<String>> {
     let AcceptLanguage(lang) = lang;
     let logged_in = session.is_some();
@@ -114,8 +114,8 @@ pub fn r_account_register_post<'a>(
         RenderInfo {
             session: session.map(|s| SessionInfo { user: s.0.user }),
             importing: is_importing(),
+            lang,
         },
-        lang,
     )))
 }