⬆️ Actualiza versiones de las dependencias

Cargo.toml

@@ -0,0 +1,11 @@
+[workspace]
+
+members = [
+    "pagetop",
+    "pagetop-admin",
+    "pagetop-user",
+    "pagetop-node",
+    "pagetop-mdbook",
+    "website",
+    "drust",
+]

drust/Cargo.toml

@@ -19,7 +19,7 @@ features = ["mysql"]
 default-features = false
 
 [dependencies]
-actix-web = "4.1.0"
+actix-web = "4.2.1"
 pagetop-admin = { path = "../pagetop-admin" }
 pagetop-user = { path = "../pagetop-user" }
 pagetop-node = { path = "../pagetop-node" }

pagetop-admin/Cargo.toml

@@ -15,4 +15,4 @@ license = "Apache-2.0 or MIT"
 
 [dependencies]
 pagetop = { path = "../pagetop" }
-maud = { git = "https://github.com/lambda-fairy/maud", rev = "e6787cd6" }
+maud = "0.24.0"

pagetop-mdbook/Cargo.toml

@@ -16,7 +16,7 @@ license = "Apache-2.0 or MIT"
 [dependencies]
 pagetop = { path = "../pagetop" }
 static-files = "0.2.3"
-maud = { git = "https://github.com/lambda-fairy/maud", rev = "e6787cd6" }
+maud = "0.24.0"
 
 [build-dependencies]
 pagetop = { path = "../pagetop" }

pagetop/Cargo.toml

@@ -25,13 +25,13 @@ categories = [
 async-trait   = "0.1.57"
 concat-string = "1.0.1"
 doc-comment   = "0.3.3"
-figlet-rs     = "0.1.3"
+figlet-rs     = "0.1.4"
-futures       = "0.3.21"
+futures       = "0.3.24"
-once_cell     = "1.13.0"
+once_cell     = "1.15.0"
-paste         = "1.0.8"
+paste         = "1.0.9"
 substring     = "1.4.5"
 term_size     = "0.3.2"
-url           = "2.2.2"
+url           = "2.3.1"
 
 config_rs = { package = "config", version = "0.11.0", features = ["toml"] }
 
@@ -39,27 +39,27 @@ tracing = "0.1.36"
 tracing-appender = "0.2.2"
 tracing-subscriber = { version = "0.3.15", features = ["json", "env-filter"] }
 tracing-unwrap = { version = "0.9.2", default-features = false }
-tracing-actix-web = "0.6.0"
+tracing-actix-web = "0.6.1"
 
-fluent-templates = "0.7.1"
+fluent-templates = "0.8.0"
 unic-langid = "0.9.0"
 
-actix-web = "4.1.0"
+actix-web = "4.2.1"
 actix-web-files = { package = "actix-files", version = "0.6.2" }
 actix-web-static-files = "4.0.0"
 static-files = "0.2.3"
 
-maud = { git = "https://github.com/lambda-fairy/maud", rev = "e6787cd6", features = ["actix-web"] }
+maud = { version = "0.24.0", features = ["actix-web"] }
 
 serde = { version = "1.0", features = ["derive"] }
 
 [dependencies.sea-orm]
-version = "0.9.1"
+version = "0.9.3"
 features = ["debug-print", "macros", "runtime-async-std-native-tls"]
 default-features = false
 optional = true
 [dependencies.sea-schema]
-version = "0.9.3"
+version = "0.9.4"
 optional = true
 
 [features]
@@ -73,7 +73,7 @@ sqlite   = ["database", "sea-orm/sqlx-sqlite"]
 static-files = "0.2.3"
 
 [dev-dependencies]
-tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
 
 [lib]
 name = "pagetop"

pagetop/STARTER.bin.Cargo.toml

@@ -12,12 +12,16 @@ path = "../pagetop"
 features = ["mysql"]
 # features = ["postgres"]
 # features = ["sqlite"]
-# En este caso hay que deshabilitar las características predeterminadas:
+# En cuyo caso habrá que deshabilitar las características predeterminadas:
 default-features = false
 
 [dependencies]
-actix-web = "4.1.0"
+actix-web = "4.2.1"
-# Si se usa la macro html!:
+# Para usar la macro html! (opcional):
-maud = { git = "https://github.com/lambda-fairy/maud", rev = "e6787cd6" }
+maud = "0.24.0"
-# Si se requiere serialización de estructuras de datos:
+# Para serializar estructuras de datos (opcional):
 serde = { version = "1.0", features = ["derive"] }
+
+[build-dependencies]
+# Para incluir archivos y recursos binarios en el ejecutable (opcional):
+pagetop = { path = "../pagetop" }

pagetop/STARTER.lib.Cargo.toml

@@ -8,13 +8,17 @@ edition = "2021"
 
 [dependencies.pagetop]
 path = "../pagetop"
-# Para dar soporte a bases de datos:
+# Si requiere base de datos:
 features = ["database"]
-# En este caso hay que deshabilitar las características predeterminadas:
+# En cuyo caso habrá que deshabilitar las características predeterminadas:
 default-features = false
 
 [dependencies]
-# Si se usa la macro html!:
+# Para usar la macro html! (opcional):
-maud = { git = "https://github.com/lambda-fairy/maud", rev = "e6787cd6" }
+maud = "0.24.0"
-# Si se requiere serialización de estructuras de datos:
+# Para serializar estructuras de datos (opcional):
 serde = { version = "1.0", features = ["derive"] }
+
+[build-dependencies]
+# Para incluir archivos y recursos binarios en la propia librería (opcional):
+pagetop = { path = "../pagetop" }

pagetop/src/locale.rs

@@ -22,7 +22,7 @@ macro_rules! localize {
 
         #[allow(dead_code)]
         fn l(key: &str) -> String {
-            LOCALES.lookup(&LANGID, key)
+            LOCALES.lookup(&LANGID, key).unwrap_or(key.to_string())
         }
 
         #[allow(dead_code)]
@@ -30,7 +30,7 @@ macro_rules! localize {
             key: &str,
             args: &std::collections::HashMap<String, FluentValue>
         ) -> String {
-            LOCALES.lookup_with_args(&LANGID, key, args)
+            LOCALES.lookup_with_args(&LANGID, key, args).unwrap_or(key.to_string())
         }
 
         #[allow(dead_code)]
@@ -39,7 +39,7 @@ macro_rules! localize {
             args: &std::collections::HashMap<String, FluentValue>
         ) -> $crate::html::PreEscaped<String> {
             $crate::html::PreEscaped(
-                LOCALES.lookup_with_args(&LANGID, key, args)
+                LOCALES.lookup_with_args(&LANGID, key, args).unwrap_or(key.to_string())
             )
         }
     };

website/Cargo.toml

@@ -17,10 +17,10 @@ license = "Apache-2.0 or MIT"
 path = "../pagetop"
 
 [dependencies]
-actix-web = "4.1.0"
+actix-web = "4.2.1"
 static-files = "0.2.3"
 pagetop-mdbook = { path = "../pagetop-mdbook" }
-maud = { git = "https://github.com/lambda-fairy/maud", rev = "e6787cd6" }
+maud = "0.24.0"
 
 [build-dependencies]
 pagetop = { path = "../pagetop" }

website/build.rs

@@ -2,14 +2,6 @@ use pagetop::util::bundle_resources;
 use pagetop_mdbook::util::except_mdbook_common_resources;
 
 fn main() -> std::io::Result<()> {
-    bundle_resources(
+    bundle_resources("./doc/en", "guides_en", Some(except_mdbook_common_resources))?;
-        "./static/doc/en",
+    bundle_resources("./doc/es", "guias_es",  Some(except_mdbook_common_resources))
-        "guides_en",
-        Some(except_mdbook_common_resources),
-    )?;
-    bundle_resources(
-        "./static/doc/es",
-        "guias_es",
-        Some(except_mdbook_common_resources),
-    )
 }