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

Replace unmaintained lexical-sort with ICU

Browse source
This commit is contained in:
Josh Megnauth 2024-07-10 03:22:23 -04:00 • committed by Jeremy Soller
parent 24cacb0da8
commit 3caea33288
6 changed files with 290 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/config.rs
View file

@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
use std::collections::BTreeMap;
use std::sync::OnceLock;
use crate::fl;
use crate::{fl, localize::LANGUAGE_SORTER};
pub const CONFIG_VERSION: u64 = 1;
pub const COSMIC_THEME_DARK: &str = "COSMIC Dark";
@ -311,7 +311,7 @@ impl Config {
color_scheme_names.push((name, *color_scheme_id));
}
color_scheme_names.sort_by(|a, b| lexical_sort::natural_lexical_cmp(&a.0, &b.0));
color_scheme_names.sort_by(|a, b| LANGUAGE_SORTER.compare(&a.0, &b.0));
color_scheme_names
}
@ -347,7 +347,7 @@ impl Config {
profile_names.push((name, *profile_id));
}
profile_names.sort_by(|a, b| lexical_sort::natural_lexical_cmp(&a.0, &b.0));
profile_names.sort_by(|a, b| LANGUAGE_SORTER.compare(&a.0, &b.0));
profile_names
}