Merge pull request #2989 from nrq6993-a11y/stream/vc-feat3-2206-font-script-han

Font menu: label the Japanese script filter as 汉字 in Chinese UI (#2206)
This commit is contained in:
BFlat
2026-10-20 02:00:59 +07:00
committed by GitHub
3 changed files with 9 additions and 1 deletions
+7 -1
View File
@@ -89,7 +89,8 @@ const SCRIPTS: usize = 4;
fn script_label(i: usize) -> &'static str {
match i {
1 => tl!("Japanese"),
// CJK families use the `japanese` font trait; Chinese UI calls this 汉字 (#2206).
1 => crate::i18n::tr_ctx(crate::i18n::current(), "font-script", "Japanese"),
2 => tl!("Latin"),
3 => tl!("Thai"),
_ => tl!("All Scripts"),
@@ -776,6 +777,11 @@ mod tests {
assert_eq!(passing(japanese), [0, 1]);
assert_eq!(passing(latin), [0, 2]);
assert_eq!(super::script_label(3), "Thai");
let zh = crate::i18n::Lang::from_code("zh-hans").unwrap();
crate::i18n::set_current(zh);
assert_eq!(super::script_label(1), "汉字");
crate::i18n::set_current(crate::i18n::Lang::EN);
assert_eq!(super::script_label(1), "Japanese");
}
/// #2277: the list's scroll bar has a column of its own, so the stars at the rows' right ends
+1
View File
@@ -2255,6 +2255,7 @@ diagnostics ui 界面
Printer mark type: 打印机标记类型:
Roman 西式
mark-style Japanese 日式
font-script Japanese 汉字
Printer profile: 打印机配置文件:
Printer Setup… 打印机设置…
Printer: 打印机:
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1
View File
@@ -3084,6 +3084,7 @@ diagnostics ui 介面
Printer mark type: 印表機標記類型:
Roman 西式
mark-style Japanese 日式
font-script Japanese 漢字
Printer profile: 印表機描述檔:
Printer Setup… 印表機設定…
Printer: 印表機:
Can't render this file because it contains an unexpected character in line 6 and column 47.