Skip to content

Fix lang matcher not picking the most specific hit #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DHowett merged 1 commit into from
May 24, 2025
Merged

Fix lang matcher not picking the most specific hit #256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/bin/edit/localization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,9 @@ const S_LANG_LUT: [[&str; LangId::Count as usize]; LocId::Count as usize] = [
static mut S_LANG: LangId = LangId::en;

pub fn init() {
// WARNING:
// Generic language tags such as "zh" MUST be sorted after more specific tags such
// as "zh-hant" to ensure that the prefix match finds the most specific one first.
const LANG_MAP: &[(&str, LangId)] = &[
("en", LangId::en),
// ----------------
Expand All @@ -954,11 +957,11 @@ pub fn init() {
let langs = sys::preferred_languages(&scratch);
let mut lang = LangId::en;

for l in langs {
'outer: for l in langs {
for (prefix, id) in LANG_MAP {
if l.starts_with_ignore_ascii_case(prefix) {
lang = *id;
break;
break 'outer;
}
}
}
Expand Down