diff --git a/Cargo.lock b/Cargo.lock index ad273146..27c4a241 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1560,7 +1560,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pagetop" -version = "0.0.56" +version = "0.0.57" dependencies = [ "actix-files", "actix-session", @@ -1590,7 +1590,7 @@ dependencies = [ [[package]] name = "pagetop-build" -version = "0.0.11" +version = "0.0.12" dependencies = [ "grass", "static-files", @@ -1598,7 +1598,7 @@ dependencies = [ [[package]] name = "pagetop-macros" -version = "0.0.13" +version = "0.0.14" dependencies = [ "proc-macro-crate", "proc-macro-error", diff --git a/Cargo.toml b/Cargo.toml index 8c5912b2..fa090e35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pagetop" -version = "0.0.56" +version = "0.0.57" edition = "2021" description = """\ diff --git a/src/core/package/all.rs b/src/core/package/all.rs index e41d62df..301d3a02 100644 --- a/src/core/package/all.rs +++ b/src/core/package/all.rs @@ -129,8 +129,6 @@ pub fn configure_services(scfg: &mut service::web::ServiceConfig) { m.configure_service(scfg); } include_files_service!( - scfg, - assets => "/", - [&global::SETTINGS.dev.pagetop_project_dir, "static/assets"] + scfg, assets => "/", [&global::SETTINGS.dev.pagetop_project_dir, "static"] ); } diff --git a/src/locale.rs b/src/locale.rs index 71d0aa2f..6cc79c9f 100644 --- a/src/locale.rs +++ b/src/locale.rs @@ -112,13 +112,13 @@ static LANGUAGES: LazyLock> = LazyLo ] }); -static FALLBACK: LazyLock = LazyLock::new(|| langid!("en-US")); +pub static FALLBACK_LANGID: LazyLock = LazyLock::new(|| langid!("en-US")); /// Sets the application's default /// [Unicode Language Identifier](https://unicode.org/reports/tr35/tr35.html#Unicode_language_identifier) /// through `SETTINGS.app.language`. pub static DEFAULT_LANGID: LazyLock<&LanguageIdentifier> = - LazyLock::new(|| langid_for(&global::SETTINGS.app.language).unwrap_or(&FALLBACK)); + LazyLock::new(|| langid_for(&global::SETTINGS.app.language).unwrap_or(&FALLBACK_LANGID)); pub enum LangError { EmptyLang,