From 67952f68401d81879b8d86c93fd7a49c80644dd1 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Tue, 1 Mar 2022 23:42:37 +0100
Subject: [PATCH] =?UTF-8?q?Actualiza=20la=20inicializaci=C3=B3n=20de=20tra?=
 =?UTF-8?q?za+localizaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/mod.rs                               |  2 +-
 src/{locale/locale.rs => core/server/langid.rs} |  0
 src/core/server/main.rs                         | 10 +++++-----
 src/core/server/mod.rs                          |  5 +++++
 src/{trace/trace.rs => core/server/tracing.rs}  |  0
 src/{locale/mod.rs => locale.rs}                |  4 +---
 src/{trace/mod.rs => trace.rs}                  |  3 ---
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{locale/locale.rs => core/server/langid.rs} (100%)
 rename src/{trace/trace.rs => core/server/tracing.rs} (100%)
 rename src/{locale/mod.rs => locale.rs} (97%)
 rename src/{trace/mod.rs => trace.rs} (71%)

diff --git a/src/config/mod.rs b/src/config/mod.rs
index afefaf4f..aba410ee 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -2,4 +2,4 @@
 pub const CONFIG_DIR: &'static str = "config";
 
 mod settings;
-pub use crate::config::settings::{CONFIG, SETTINGS};
+pub use settings::{CONFIG, SETTINGS};
diff --git a/src/locale/locale.rs b/src/core/server/langid.rs
similarity index 100%
rename from src/locale/locale.rs
rename to src/core/server/langid.rs
diff --git a/src/core/server/main.rs b/src/core/server/main.rs
index fb9663b1..c39c9f83 100644
--- a/src/core/server/main.rs
+++ b/src/core/server/main.rs
@@ -1,4 +1,4 @@
-use crate::{Lazy, base, locale, trace};
+use crate::{Lazy, base, trace};
 use crate::config::SETTINGS;
 use crate::core::{Server, all, server};
 use crate::core::module::register_module;
@@ -32,11 +32,11 @@ pub fn run(bootstrap: Option<fn()>) -> Result<Server, std::io::Error> {
         );
     }
 
-    // Traza de seguimiento.
-    Lazy::force(&trace::TRACING);
+    // Inicia la traza de la aplicación.
+    Lazy::force(&server::tracing::TRACING);
 
-    // Identificador de idioma.
-    Lazy::force(&locale::LANGID);
+    // Asigna identificador de idioma.
+    Lazy::force(&server::langid::LANGID);
 
     // Ejecuta la función de inicio de la aplicación.
     if bootstrap != None {
diff --git a/src/core/server/mod.rs b/src/core/server/mod.rs
index 32e9ce92..6bb25129 100644
--- a/src/core/server/mod.rs
+++ b/src/core/server/mod.rs
@@ -2,5 +2,10 @@ pub use actix_web::{
     App, HttpRequest, HttpResponse, HttpServer, Responder, Result, http, web
 };
 
+mod tracing;
+
+mod langid;
+pub use langid::LANGID;
+
 mod main;
 pub use main::run;
diff --git a/src/trace/trace.rs b/src/core/server/tracing.rs
similarity index 100%
rename from src/trace/trace.rs
rename to src/core/server/tracing.rs
diff --git a/src/locale/mod.rs b/src/locale.rs
similarity index 97%
rename from src/locale/mod.rs
rename to src/locale.rs
index e13d9f21..b43d9fd6 100644
--- a/src/locale/mod.rs
+++ b/src/locale.rs
@@ -2,14 +2,12 @@ pub use fluent_templates::{static_loader as static_locale, Loader as Locale};
 pub use fluent_templates;
 pub use fluent_templates::fluent_bundle::FluentValue;
 
-mod locale;
-pub use locale::LANGID;
-
 #[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)? ) => {
         use $crate::locale::*;
+        use $crate::core::server::LANGID;
 
         static_locale! {
             static LOCALES = {
diff --git a/src/trace/mod.rs b/src/trace.rs
similarity index 71%
rename from src/trace/mod.rs
rename to src/trace.rs
index 8ffa8bcd..d8943c68 100644
--- a/src/trace/mod.rs
+++ b/src/trace.rs
@@ -1,5 +1,2 @@
 pub use tracing::{Level, event, span};
 pub use tracing::{debug, error, info, trace, warn};
-
-mod trace;
-pub use trace::TRACING;