From 516d9683da657176dbd671ce669e4c26b2d4acdd Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Thu, 17 Mar 2022 19:43:42 +0100 Subject: [PATCH] Modifica y predetermina los locales para en-US --- pagetop/src/base/module/admin/mod.rs | 2 +- pagetop/src/base/module/homepage/mod.rs | 2 +- pagetop/src/base/theme/bootsier/mod.rs | 2 +- pagetop/src/locale.rs | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pagetop/src/base/module/admin/mod.rs b/pagetop/src/base/module/admin/mod.rs index 808aa75e..e9b58703 100644 --- a/pagetop/src/base/module/admin/mod.rs +++ b/pagetop/src/base/module/admin/mod.rs @@ -1,6 +1,6 @@ use crate::prelude::*; -localize!("en-US", "src/base/module/admin/locales"); +localize!("src/base/module/admin/locales"); mod summary; diff --git a/pagetop/src/base/module/homepage/mod.rs b/pagetop/src/base/module/homepage/mod.rs index b6aac4fe..6b3b9741 100644 --- a/pagetop/src/base/module/homepage/mod.rs +++ b/pagetop/src/base/module/homepage/mod.rs @@ -1,6 +1,6 @@ use crate::prelude::*; -localize!("en-US", "src/base/module/homepage/locales"); +localize!("src/base/module/homepage/locales"); pub struct HomepageModule; diff --git a/pagetop/src/base/theme/bootsier/mod.rs b/pagetop/src/base/theme/bootsier/mod.rs index dd16d71c..3c4176f0 100644 --- a/pagetop/src/base/theme/bootsier/mod.rs +++ b/pagetop/src/base/theme/bootsier/mod.rs @@ -2,7 +2,7 @@ use crate::prelude::*; include!(concat!(env!("OUT_DIR"), "/bootsier.rs")); -localize!("en-US", "src/base/theme/bootsier/locales"); +localize!("src/base/theme/bootsier/locales"); pub struct BootsierTheme; diff --git a/pagetop/src/locale.rs b/pagetop/src/locale.rs index eac11472..a5a136c2 100644 --- a/pagetop/src/locale.rs +++ b/pagetop/src/locale.rs @@ -5,15 +5,15 @@ pub use fluent_templates::fluent_bundle::FluentValue; #[macro_export] /// Permite integrar fácilmente localización en temas, módulos y componentes. macro_rules! localize { - ( $DEF_LANGID:literal, $locales:literal $(, $core_locales:literal)? ) => { + ( $dir_locales:literal $(, $core_locales:literal)? ) => { use $crate::locale::*; use $crate::core::server::locale::LANGID; static_locale! { static LOCALES = { - locales: $locales, + locales: $dir_locales, $( core_locales: $core_locales, )? - fallback_language: $DEF_LANGID, + fallback_language: "en-US", // Elimina las marcas Unicode que delimitan los argumentos. customise: |bundle| bundle.set_use_isolating(false), @@ -37,8 +37,8 @@ macro_rules! localize { fn e( key: &str, args: &std::collections::HashMap - ) -> crate::core::html::PreEscaped { - crate::core::html::PreEscaped( + ) -> $crate::core::html::PreEscaped { + $crate::core::html::PreEscaped( LOCALES.lookup_with_args(&LANGID, key, args) ) }