aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-29 20:27:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

i18n: fold Polish ł and additional Latin diacritics in name_sort_key

Browse Source
This commit is contained in:
el-j
2026-10-29 10:13:23 +07:00
committed by bflatastic
parent ad3dac0031
commit 813e30be69
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/i18n.rs
+9 -3
View File
@@ -670,11 +670,16 @@ pub fn name_sort_key(name: &str) -> String {
.map(|c| match c {
'à'..='å' | 'ā' | 'ă' | 'ą' => 'a',
'ç' | 'ć' | 'č' => 'c',
'ď' | 'đ' => 'd',
'è'..='ë' | 'ē' | 'ě' | 'ę' | 'ế' | 'ệ' => 'e',
'ì'..='ï' | 'ī' => 'i',
'ñ' | 'ń' | 'ň' => 'n',
'ğ' | 'ģ' => 'g',
'ì'..='ï' | 'ī' | 'ı' => 'i',
'ł' | 'ļ' => 'l',
'ñ' | 'ń' | 'ň' | 'ņ' => 'n',
'ò'..='ö' | 'ø' | 'ő' => 'o',
'ś' | 'š' => 's',
'ř' => 'r',
'ś' | 'š' | 'ş' | 'ș' => 's',
'ť' | 'ț' | 'ţ' => 't',
'ù'..='ü' | 'ū' | 'ů' | 'ű' => 'u',
'ý' | 'ÿ' => 'y',
'ź' | 'ż' | 'ž' => 'z',
@@ -696,5 +701,6 @@ mod picker_order_tests {
assert!(keys.windows(2).all(|w| w[0] <= w[1]), "{keys:?}");
assert_eq!(name_sort_key("Čeština"), "cestina");
assert_eq!(name_sort_key("Türkçe"), "turkce");
assert_eq!(name_sort_key("Łącza"), "lacza");
}
}
crates/ui-egui/src/menus/tests.rs
+14
View File
@@ -830,5 +830,19 @@ fn window_menu_panels_are_sorted_alphabetically_in_active_language() {
assert!(type_keys.windows(2).all(|w| w[0] <= w[1]), "Type submenu must be alphabetical: {type_labels:?}");
assert_eq!(type_labels, vec!["Caractère", "Glyphes", "OpenType", "Paragraphe", "Styles de caractère", "Styles de paragraphe", "Tabulations",]);
// 4. In Polish: Łącza (Links) folds to L and sorts before Warstwy and Zmienne.
let pl = Lang::from_code("pl").unwrap();
set_current(pl);
let tree_pl = menu_tree();
let (_, window_pl) = tree_pl.iter().find(|(t, _)| *t == "Window").unwrap();
let seps_pl: Vec<usize> = window_pl.iter().enumerate().filter(|(_, it)| matches!(it, Item::Sep)).map(|(i, _)| i).collect();
let panels_pl = &window_pl[seps_pl[1] + 1..seps_pl[2]];
let pl_labels: Vec<String> = panels_pl.iter().map(|it| item_display(it, pl)).collect();
let pl_keys: Vec<String> = pl_labels.iter().map(|l| name_sort_key(l)).collect();
assert!(pl_keys.windows(2).all(|w| w[0] <= w[1]), "Polish panels must be alphabetical: {pl_labels:?}");
let pos_pl = |name: &str| pl_labels.iter().position(|l| l == name).unwrap_or_else(|| panic!("missing {name} in {pl_labels:?}"));
assert!(pos_pl("Łącza") < pos_pl("Warstwy"), "Łącza before Warstwy");
assert!(pos_pl("Warstwy") < pos_pl("Zmienne"), "Warstwy before Zmienne");
set_current(prev);
}