From e5d8e6c62f1e57f43a79938438e5d052dc3bac06 Mon Sep 17 00:00:00 2001
From: Franz Dietrich <dietrich@teilgedanken.de>
Date: Tue, 25 May 2021 20:13:56 +0200
Subject: [PATCH] restructuring move translations to toplevel

---
 app/Makefile.toml                    | 0
 app/src/i18n.rs                      | 2 +-
 app/src/lib.rs                       | 2 +-
 app/src/navigation.rs                | 3 +--
 {app/locales => locales}/de/main.ftl | 0
 {app/locales => locales}/en/main.ftl | 0
 6 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 app/Makefile.toml
 rename {app/locales => locales}/de/main.ftl (100%)
 rename {app/locales => locales}/en/main.ftl (100%)

diff --git a/app/Makefile.toml b/app/Makefile.toml
deleted file mode 100644
index e69de29..0000000
diff --git a/app/src/i18n.rs b/app/src/i18n.rs
index 649fbb8..6268276 100644
--- a/app/src/i18n.rs
+++ b/app/src/i18n.rs
@@ -81,7 +81,7 @@ impl Lang {
     pub const fn ftl_messages(self) -> &'static str {
         macro_rules! include_ftl_messages {
             ( $lang_id:literal ) => {
-                include_str!(concat!("../locales/", $lang_id, "/main.ftl"))
+                include_str!(concat!("../../locales/", $lang_id, "/main.ftl"))
             };
         }
         match self {
diff --git a/app/src/lib.rs b/app/src/lib.rs
index 0d87da4..9724b54 100644
--- a/app/src/lib.rs
+++ b/app/src/lib.rs
@@ -19,7 +19,7 @@ fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
 
     log!(url);
 
-    let lang = I18n::new(Lang::DeDE);
+    let lang = I18n::new(Lang::EnUS);
 
     Model {
         index: 0,
diff --git a/app/src/navigation.rs b/app/src/navigation.rs
index 9e3e1a5..7a7ed19 100644
--- a/app/src/navigation.rs
+++ b/app/src/navigation.rs
@@ -58,8 +58,7 @@ pub fn navigation(i18n: &I18n, base_url: &Url, user: &Option<User>) -> Node<Msg>
             li![div![welcome]],
             // The logout button
             li![a![
-                attrs! {At::Href => "/admin/logout"},
-                ev(Ev::Click, |_| Msg::NoMessage),
+                attrs! {At::Href => "/admin/logout/"},
                 t("logout"),
             ]]
         ]
diff --git a/app/locales/de/main.ftl b/locales/de/main.ftl
similarity index 100%
rename from app/locales/de/main.ftl
rename to locales/de/main.ftl
diff --git a/app/locales/en/main.ftl b/locales/en/main.ftl
similarity index 100%
rename from app/locales/en/main.ftl
rename to locales/en/main.ftl