leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(cargo): switch lichen-system dep to locales-rs

Browse source 
Fixes #1049
This commit is contained in:
Michael Aaron Murphy 2025-03-13 20:32:59 +01:00
parent d2c1756c86
commit 9fb29f0a2a
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
3 changed files with 18 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Cargo.lock generated
View file

@ -1700,6 +1700,7 @@ dependencies = [
"itoa",
"libcosmic",
"locale1",
"locales-rs",
"mime 0.3.17",
"notify",
"once_cell",
@ -1714,7 +1715,6 @@ dependencies = [
"smithay-client-toolkit",
"static_init",
"sunrise",
"system",
"tachyonix",
"timedate-zbus",
"tokio",
@ -1868,21 +1868,6 @@ dependencies = [
"libc",
]
[[package]]
name = "crc"
version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
dependencies = [
"crc-catalog",
]
[[package]]
name = "crc-catalog"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]]
name = "crc32fast"
version = "1.4.2"
@ -2939,18 +2924,6 @@ dependencies = [
"gl_generator",
]
[[package]]
name = "gpt"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffa5448a0d9d541f1840c0e1b5fe513360861ca83c4b920619f54efe277f9254"
dependencies = [
"bitflags 2.8.0",
"crc",
"simple-bytes",
"uuid",
]
[[package]]
name = "gpu-alloc"
version = "0.6.0"
@ -4607,6 +4580,17 @@ dependencies = [
"winapi",
]
[[package]]
name = "locales-rs"
version = "0.1.0"
source = "git+https://github.com/AerynOS/locales-rs#4ebab71f5b6bc60a5e2c55207a26812a666817f5"
dependencies = [
"fs-err",
"serde",
"serde_json",
"thiserror 2.0.11",
]
[[package]]
name = "lock_api"
version = "0.4.12"
@ -6629,12 +6613,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "simple-bytes"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11532d9d241904f095185f35dcdaf930b1427a94d5b01d7002d74ba19b44cc4"
[[package]]
name = "simplecss"
version = "0.2.2"
@ -6861,16 +6839,6 @@ dependencies = [
"chrono",
]
[[package]]
name = "superblock"
version = "0.1.0"
source = "git+https://github.com/serpent-os/blsforme.git#db14701afcc7d99e4cd794fc0be21b0a0b41d097"
dependencies = [
"log",
"thiserror 2.0.11",
"uuid",
]
[[package]]
name = "svg_fmt"
version = "0.4.4"
@ -6954,19 +6922,6 @@ dependencies = [
"windows 0.57.0",
]
[[package]]
name = "system"
version = "0.1.0"
source = "git+https://github.com/serpent-os/lichen#990a7913eb69341233551f59ca13da437612d1ad"
dependencies = [
"fs-err",
"gpt",
"serde",
"serde_json",
"superblock",
"thiserror 2.0.11",
]
[[package]]
name = "system-deps"
version = "6.2.2"
@ -7599,9 +7554,6 @@ name = "uuid"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1f41ffb7cf259f1ecc2876861a17e7142e63ead296f671f81f6ae85903e0d6"
dependencies = [
"getrandom 0.3.1",
]
[[package]]
name = "v_frame"

7
cosmic-settings/Cargo.toml
View file

@ -101,9 +101,8 @@ version = "0.15.3"
features = ["fluent-system", "desktop-requester"]
# Contains region-handling logic for Linux
[dependencies.lichen-system]
git = "https://github.com/serpent-os/lichen"
package = "system"
[dependencies.locales-rs]
git = "https://github.com/AerynOS/locales-rs"
optional = true
[features]
@ -165,7 +164,7 @@ page-networking = [
page-power = ["dep:upower_dbus", "dep:zbus"]
page-region = [
"gettext",
"dep:lichen-system",
"dep:locales-rs",
"dep:locale1",
"dep:zbus",
]

6
cosmic-settings/src/pages/time/region.rs
View file

@ -21,7 +21,7 @@ use icu::datetime::options::preferences;
use icu::datetime::DateTimeFormatter;
use icu::decimal::options::FixedDecimalFormatterOptions;
use icu::decimal::FixedDecimalFormatter;
use lichen_system::locale;
use locales_rs as locale;
use slotmap::{DefaultKey, SlotMap};
#[derive(Clone, Debug)]
@ -849,7 +849,7 @@ fn language_element(
widget::settings::item(description, popover_button(id, expanded)).into()
}
fn localized_iso_codes(locale: &lichen_system::locale::Locale) -> (String, String) {
fn localized_iso_codes(locale: &locale::Locale) -> (String, String) {
let mut language = gettextrs::dgettext("iso_639", &locale.language.display_name);
let country = gettextrs::dgettext("iso_3166", &locale.territory.display_name);
@ -862,7 +862,7 @@ fn localized_iso_codes(locale: &lichen_system::locale::Locale) -> (String, Strin
(language, country)
}
fn localized_locale(locale: &lichen_system::locale::Locale, lang_code: String) -> SystemLocale {
fn localized_locale(locale: &locale::Locale, lang_code: String) -> SystemLocale {
let (language, country) = localized_iso_codes(locale);
SystemLocale {