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

chore: update to icu 2.0.0

Browse source
This commit is contained in:
Vukašin Vojinović 2025-09-15 23:55:28 +02:00 • committed by Jeremy Soller
parent 6f06badab0
commit 42f566007f
3 changed files with 303 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

698
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

3
Cargo.toml
View file

@ -26,8 +26,7 @@ i18n-embed = { version = "0.16", features = [
"desktop-requester", "desktop-requester",
] } ] }
i18n-embed-fl = "0.10" i18n-embed-fl = "0.10"
icu_collator = "1.5" icu = { version = "2.0.0", features = ["compiled_data"] }
icu_provider = { version = "1.5", features = ["sync"] }
rust-embed = "8" rust-embed = "8"
url = "2.5" url = "2.5"

37
src/localize.rs
View file

@ -1,14 +1,16 @@
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use std::{str::FromStr, sync::LazyLock};
use i18n_embed::{ use i18n_embed::{
DefaultLocalizer, LanguageLoader, Localizer, DefaultLocalizer, LanguageLoader, Localizer,
fluent::{FluentLanguageLoader, fluent_language_loader}, fluent::{FluentLanguageLoader, fluent_language_loader},
}; };
use icu_collator::{Collator, CollatorOptions, Numeric}; use icu::collator::{
use icu_provider::DataLocale; Collator, CollatorBorrowed, CollatorPreferences, options::CollatorOptions,
preferences::CollationNumericOrdering,
};
use icu::locale::Locale;
use rust_embed::RustEmbed; use rust_embed::RustEmbed;
use std::sync::LazyLock;
#[derive(RustEmbed)] #[derive(RustEmbed)]
#[folder = "i18n/"] #[folder = "i18n/"]
@ -24,19 +26,26 @@ pub static LANGUAGE_LOADER: LazyLock<FluentLanguageLoader> = LazyLock::new(|| {
loader loader
}); });
pub static LANGUAGE_SORTER: LazyLock<Collator> = LazyLock::new(|| { pub static LANGUAGE_SORTER: LazyLock<CollatorBorrowed> = LazyLock::new(|| {
let mut options = CollatorOptions::new(); let create_collator = |locale: Locale| {
options.numeric = Some(Numeric::On); let mut prefs = CollatorPreferences::from(locale);
prefs.numeric_ordering = Some(CollationNumericOrdering::True);
Collator::try_new(prefs, CollatorOptions::default()).ok()
};
DataLocale::from_str(&LANGUAGE_LOADER.current_language().to_string()) Locale::try_from_str(&LANGUAGE_LOADER.current_language().to_string())
.or_else(|_| DataLocale::from_str(&LANGUAGE_LOADER.fallback_language().to_string()))
.ok() .ok()
.and_then(|locale| Collator::try_new(&locale, options).ok()) .and_then(create_collator)
.or_else(|| { .or_else(|| {
let locale = DataLocale::from_str("en-US").expect("en-US is a valid BCP-47 tag"); Locale::try_from_str(&LANGUAGE_LOADER.fallback_language().to_string())
Collator::try_new(&locale, options).ok() .ok()
.and_then(create_collator)
})
.unwrap_or_else(|| {
let locale = Locale::try_from_str("en-US").expect("en-US is a valid BCP-47 tag");
create_collator(locale)
.expect("Creating a collator from the system's current language, the fallback language, or American English should succeed")
}) })
.expect("Creating a collator from the system's current language, the fallback language, or American English should succeed")
}); });
#[macro_export] #[macro_export]
@ -60,6 +69,6 @@ pub fn localize() {
let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages(); let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages();
if let Err(error) = localizer.select(&requested_languages) { if let Err(error) = localizer.select(&requested_languages) {
eprintln!("Error while loading language for App List {error}"); eprintln!("Error while loading language for COSMIC Terminal {error}");
} }
} }