Replace lexical-sort with icu
`lexical-sort` is unmaintained. The author recommends switching to the official set of ICU crates.
This commit is contained in:
parent
e64bdac21c
commit
d7e46938ae
4 changed files with 286 additions and 3 deletions
|
|
@ -1,11 +1,14 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
use std::str::FromStr;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
use i18n_embed::{
|
||||
fluent::{fluent_language_loader, FluentLanguageLoader},
|
||||
DefaultLocalizer, LanguageLoader, Localizer,
|
||||
};
|
||||
use icu_collator::{Collator, CollatorOptions, Numeric};
|
||||
use icu_provider::DataLocale;
|
||||
use rust_embed::RustEmbed;
|
||||
|
||||
#[derive(RustEmbed)]
|
||||
|
|
@ -13,6 +16,7 @@ use rust_embed::RustEmbed;
|
|||
struct Localizations;
|
||||
|
||||
pub static LANGUAGE_LOADER: OnceLock<FluentLanguageLoader> = OnceLock::new();
|
||||
pub static LANGUAGE_SORTER: OnceLock<Collator> = OnceLock::new();
|
||||
|
||||
#[macro_export]
|
||||
macro_rules! fl {
|
||||
|
|
@ -51,3 +55,22 @@ pub fn localize() {
|
|||
eprintln!("Error while loading language for App List {}", error);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn sorter() -> &'static Collator {
|
||||
LANGUAGE_SORTER.get_or_init(|| {
|
||||
let mut options = CollatorOptions::new();
|
||||
options.numeric = Some(Numeric::On);
|
||||
let localizer = localizer();
|
||||
let language_loader = localizer.language_loader();
|
||||
|
||||
DataLocale::from_str(&language_loader.current_language().to_string())
|
||||
.or_else(|_| DataLocale::from_str(&language_loader.fallback_language().to_string()))
|
||||
.ok()
|
||||
.and_then(|locale| Collator::try_new(&locale, options).ok())
|
||||
.or_else(|| {
|
||||
let locale = DataLocale::from_str("en-US").expect("en-US is a valid BCP-47 tag");
|
||||
Collator::try_new(&locale, options).ok()
|
||||
})
|
||||
.expect("Creating a collator from the system's current language, the fallback language, or American English should succeed")
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ impl Ord for ProjectNode {
|
|||
}
|
||||
}
|
||||
}
|
||||
lexical_sort::natural_lexical_cmp(self.name(), other.name())
|
||||
crate::localize::sorter().compare(self.name(), other.name())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue