From 3c5da6936e535fa9702932687b92f291a4ab4890 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 20 Aug 2023 12:59:40 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Use=20L10n=20component=20for=20t?= =?UTF-8?q?ranslating=20texts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop/src/locale.rs | 21 --------------------- pagetop/src/prelude.rs | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pagetop/src/locale.rs b/pagetop/src/locale.rs index 0ff18865..53071011 100644 --- a/pagetop/src/locale.rs +++ b/pagetop/src/locale.rs @@ -161,24 +161,3 @@ macro_rules! static_locales { } }; } - -#[macro_export] -macro_rules! t { - ( $langid:expr, $locales:expr, $key:expr ) => { - $locales.lookup($langid, $key).unwrap_or($key.to_string()) - }; - ( $langid:expr, $locales:expr, $key:expr, $args:expr ) => { - $locales - .lookup_with_args( - $langid, - $key, - &$args - .iter() - .fold(std::collections::HashMap::new(), |mut a, (k, v)| { - a.insert(k.to_string(), v.to_owned().into()); - a - }), - ) - .unwrap_or($key.to_string()) - }; -} diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index 8ca95ff9..e86b436a 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -15,7 +15,7 @@ pub use crate::{kv, new_handle}; // crate::config pub use crate::default_settings; // crate::locale -pub use crate::{static_locales, t}; +pub use crate::static_locales; // crate::service pub use crate::{static_files, static_files_service}; // crate::core::action