diff --git a/pagetop/src/app.rs b/pagetop/src/app.rs index a3d4e67d..dbb39ddd 100644 --- a/pagetop/src/app.rs +++ b/pagetop/src/app.rs @@ -6,7 +6,7 @@ use crate::core::{module, module::ModuleStaticRef}; use crate::html::Markup; use crate::response::fatal_error::FatalError; use crate::response::page::ResultPage; -use crate::{config, define_locale, locale, server, trace, LazyStatic}; +use crate::{config, locale, server, trace, LazyStatic}; #[cfg(feature = "database")] use crate::db; @@ -21,8 +21,6 @@ use std::io::Error; use substring::Substring; -define_locale!(LOCALE_PAGETOP, "static/locales"); - pub struct Application { server: Server, } diff --git a/pagetop/src/core/theme/definition.rs b/pagetop/src/core/theme/definition.rs index 548174a8..23b3f6c4 100644 --- a/pagetop/src/core/theme/definition.rs +++ b/pagetop/src/core/theme/definition.rs @@ -1,10 +1,9 @@ -use crate::app::LOCALE_PAGETOP; use crate::base::component::L10n; -use crate::config; use crate::core::component::{ComponentTrait, RenderContext}; use crate::core::module::ModuleTrait; use crate::html::{html, Favicon, Markup}; use crate::response::page::Page; +use crate::{config, LOCALE_PAGETOP}; pub type ThemeStaticRef = &'static dyn ThemeTrait; diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs index 1816a29c..9c1412c0 100644 --- a/pagetop/src/lib.rs +++ b/pagetop/src/lib.rs @@ -55,6 +55,8 @@ pub type HashMapResources = std::collections::HashMap<&'static str, StaticResour pub type Handle = u64; +define_locale!(LOCALE_PAGETOP, "static/locales"); + // ************************************************************************************************* // APIs PÚBLICAS. // ************************************************************************************************* diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index 23d8ec30..0bf665e5 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -2,7 +2,9 @@ //! **PageTop**. // Re-exports. -pub use crate::{concat_string, fn_builder, paste, Handle, HashMapResources, LazyStatic, ResultExt}; +pub use crate::{ + concat_string, fn_builder, paste, Handle, HashMapResources, LazyStatic, ResultExt, +}; // Macros declarativas globales. pub use crate::{args, define_config, define_handle, define_locale, serve_static_files};