From 7fb30f9ee466bc659abbf59bfb9ff9da8fbbad03 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Fri, 23 Jun 2023 08:33:15 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Renombra=20"define=5Flocale!()"?= =?UTF-8?q?=20por=20"use=5Flocale!()"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop-admin/src/lib.rs | 2 +- pagetop-bootsier/src/lib.rs | 2 +- pagetop-homedemo/src/lib.rs | 2 +- pagetop-minimal/src/module/menu.rs | 2 +- pagetop-node/src/lib.rs | 2 +- pagetop-user/src/lib.rs | 2 +- pagetop/src/lib.rs | 2 +- pagetop/src/locale.rs | 4 ++-- pagetop/src/util.rs | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs index b99f9004..61f10e5e 100644 --- a/pagetop-admin/src/lib.rs +++ b/pagetop-admin/src/lib.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(MODULE_ADMIN); -define_locale!(LOCALE_ADMIN, "src/locale"); +use_locale!(LOCALE_ADMIN, "src/locale"); mod summary; diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs index 8c4faca2..34634afc 100644 --- a/pagetop-bootsier/src/lib.rs +++ b/pagetop-bootsier/src/lib.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(THEME_BOOTSIER); -define_locale!(LOCALE_BOOTSIER, "src/locale"); +use_locale!(LOCALE_BOOTSIER, "src/locale"); include!(concat!(env!("OUT_DIR"), "/bootsier.rs")); diff --git a/pagetop-homedemo/src/lib.rs b/pagetop-homedemo/src/lib.rs index eebede06..1bb7f3bd 100644 --- a/pagetop-homedemo/src/lib.rs +++ b/pagetop-homedemo/src/lib.rs @@ -3,7 +3,7 @@ use pagetop_minimal::component::*; use_handle!(MODULE_DEMOHOME); -define_locale!(LOCALE_DEMOHOME, "src/locale"); +use_locale!(LOCALE_DEMOHOME, "src/locale"); include!(concat!(env!("OUT_DIR"), "/homedemo.rs")); diff --git a/pagetop-minimal/src/module/menu.rs b/pagetop-minimal/src/module/menu.rs index caad3c4e..7fd844c1 100644 --- a/pagetop-minimal/src/module/menu.rs +++ b/pagetop-minimal/src/module/menu.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(MODULE_MENU); -define_locale!(LOCALE_MENU, "src/module/menu/locales"); +use_locale!(LOCALE_MENU, "src/module/menu/locales"); pub struct Menu; diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs index 18df74e3..2548b57b 100644 --- a/pagetop-node/src/lib.rs +++ b/pagetop-node/src/lib.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(MODULE_NODE); -define_locale!(LOCALE_NODE, "src/locale"); +use_locale!(LOCALE_NODE, "src/locale"); //mod entity; mod migration; diff --git a/pagetop-user/src/lib.rs b/pagetop-user/src/lib.rs index 806055ee..fe5134c2 100644 --- a/pagetop-user/src/lib.rs +++ b/pagetop-user/src/lib.rs @@ -3,7 +3,7 @@ use pagetop_minimal::component::*; use_handle!(MODULE_USER); -define_locale!(LOCALE_USER, "src/locale"); +use_locale!(LOCALE_USER, "src/locale"); mod migration; diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs index af0a8997..e68e6ebd 100644 --- a/pagetop/src/lib.rs +++ b/pagetop/src/lib.rs @@ -117,7 +117,7 @@ pub type HashMapResources = std::collections::HashMap<&'static str, StaticResour pub type Handle = u64; -define_locale!(LOCALE_PAGETOP, "src/locale"); +use_locale!(LOCALE_PAGETOP, "src/locale"); // ************************************************************************************************* // APIs PÚBLICAS. diff --git a/pagetop/src/locale.rs b/pagetop/src/locale.rs index 0367fd23..7954c4c4 100644 --- a/pagetop/src/locale.rs +++ b/pagetop/src/locale.rs @@ -70,12 +70,12 @@ //! # Cómo aplicar la localización en tu código //! //! Una vez hayas creado tu directorio de recursos FTL usa la macro -//! [`define_locale!`](crate::define_locale) para integrarlos en tu módulo o aplicación. +//! [`use_locale!`](crate::use_locale) para integrarlos en tu módulo o aplicación. //! //! ``` //! use pagetop::prelude::*; //! -//! define_locale!(LOCALE_SAMPLE, "src/locale"); +//! use_locale!(LOCALE_SAMPLE, "src/locale"); //! ``` //! Y usa el componente [L10n](crate::base::component::L10n) para incluir en las respuestas a //! peticiones web, textos y contenidos opcionalmente traducibles según el contexto de renderizado. diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs index 1db1e655..3fab7f02 100644 --- a/pagetop/src/util.rs +++ b/pagetop/src/util.rs @@ -90,7 +90,7 @@ macro_rules! use_handle { #[macro_export] /// Define un conjunto de elementos de localización y funciones locales de traducción. -macro_rules! define_locale { +macro_rules! use_locale { ( $LOCALES:ident, $dir_locales:literal $(, $core_locales:literal)? ) => { use $crate::locale::*;