Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

feat(settings): say when PingFang is missing

RoversX78dd4aab6979
diff --git a/thinkterm-i18n/i18n/de-DE.ftl b/thinkterm-i18n/i18n/de-DE.ftl
index 67b07ca9..a2a3611e 100644
--- a/thinkterm-i18n/i18n/de-DE.ftl
+++ b/thinkterm-i18n/i18n/de-DE.ftl
@@ -4,6 +4,7 @@ settings-window-title = ThinkTerm-Einstellungen
settings-window-open-error = Die Einstellungen konnten nicht geöffnet werden: { $error }
settings-language = Sprache
settings-language-description = Ändert die Sprache der ThinkTerm-Oberfläche sofort.
+settings-language-font-missing = Auf diesem Mac ist PingFang nicht installiert, daher wird Chinesisch in Hiragino Sans GB angezeigt. Für PingFang lade „PingFang SC“ in der Schriftsammlung herunter und starte ThinkTerm neu.
settings-language-changed = Sprache der Oberfläche auf { $language } geändert.
settings-language-save-error = Spracheinstellung konnte nicht gespeichert werden: { $error }
common-on = An
diff --git a/thinkterm-i18n/i18n/en-US.ftl b/thinkterm-i18n/i18n/en-US.ftl
index a9d0ac95..41d68dba 100644
--- a/thinkterm-i18n/i18n/en-US.ftl
+++ b/thinkterm-i18n/i18n/en-US.ftl
@@ -4,6 +4,7 @@ settings-window-title = ThinkTerm Settings
settings-window-open-error = Unable to open settings: { $error }
settings-language = Language
settings-language-description = Changes the language of ThinkTerm's interface immediately.
+settings-language-font-missing = PingFang isn't installed on this Mac, so Chinese is shown in Hiragino Sans GB. To use PingFang, download “PingFang SC” in Font Book, then restart ThinkTerm.
settings-language-changed = Interface language changed to { $language }.
settings-language-save-error = Unable to save language setting: { $error }
common-on = On
diff --git a/thinkterm-i18n/i18n/fr-FR.ftl b/thinkterm-i18n/i18n/fr-FR.ftl
index db07d147..90f582c4 100644
--- a/thinkterm-i18n/i18n/fr-FR.ftl
+++ b/thinkterm-i18n/i18n/fr-FR.ftl
@@ -4,6 +4,7 @@ settings-window-title = Réglages de ThinkTerm
settings-window-open-error = Impossible d’ouvrir les réglages : { $error }
settings-language = Langue
settings-language-description = Change immédiatement la langue de l’interface de ThinkTerm.
+settings-language-font-missing = PingFang n’est pas installée sur ce Mac : le chinois s’affiche donc en Hiragino Sans GB. Pour utiliser PingFang, téléchargez « PingFang SC » dans Livre des polices, puis redémarrez ThinkTerm.
settings-language-changed = La langue de l’interface est maintenant { $language }.
settings-language-save-error = Impossible d’enregistrer la langue : { $error }
common-on = Activé
diff --git a/thinkterm-i18n/i18n/ja-JP.ftl b/thinkterm-i18n/i18n/ja-JP.ftl
index cd6b5469..7e6416e8 100644
--- a/thinkterm-i18n/i18n/ja-JP.ftl
+++ b/thinkterm-i18n/i18n/ja-JP.ftl
@@ -4,6 +4,7 @@ settings-window-title = ThinkTerm 設定
settings-window-open-error = 設定を開けませんでした:{ $error }
settings-language = 言語
settings-language-description = ThinkTerm のインターフェース言語をすぐに変更します。
+settings-language-font-missing = この Mac には PingFang がないため、中国語は Hiragino Sans GB で表示しています。PingFang を使うには「Font Book」で「PingFang SC」をダウンロードし、ThinkTerm を再起動してください。
settings-language-changed = インターフェース言語を{ $language }に変更しました。
settings-language-save-error = 言語設定を保存できません:{ $error }
common-on = オン
diff --git a/thinkterm-i18n/i18n/zh-CN.ftl b/thinkterm-i18n/i18n/zh-CN.ftl
index aaeb85dd..a228f3e4 100644
--- a/thinkterm-i18n/i18n/zh-CN.ftl
+++ b/thinkterm-i18n/i18n/zh-CN.ftl
@@ -4,6 +4,7 @@ settings-window-title = ThinkTerm 设置
settings-window-open-error = 无法打开设置:{ $error }
settings-language = 语言
settings-language-description = 立即更改 ThinkTerm 界面的显示语言。
+settings-language-font-missing = 这台 Mac 上没有苹方字体,中文暂用冬青黑体显示。想用苹方,可以在“字体册”里下载“PingFang SC”,然后重启 ThinkTerm。
settings-language-changed = 界面语言已切换为{ $language }。
settings-language-save-error = 无法保存语言设置:{ $error }
common-on = 开
diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rs
index 3ba0a89b..7436646c 100644
--- a/wezterm-gui/src/settings_window.rs
+++ b/wezterm-gui/src/settings_window.rs
@@ -16929,10 +16929,23 @@ impl SettingsWindow {
y: f32,
note: &str,
width: f32,
+ ) -> anyhow::Result<f32> {
+ self.draw_row_note_in_lines(layers, x, y, note, width, self.ui.row_description_lines)
+ }
+
+ /// `draw_row_note` in at most `most` lines.
+ fn draw_row_note_in_lines(
+ &self,
+ layers: &mut TripleLayerQuadAllocator<'_>,
+ x: f32,
+ y: f32,
+ note: &str,
+ width: f32,
+ most: usize,
) -> anyhow::Result<f32> {
let palette = self.palette();
let body_font = Rc::clone(&self.body_font);
- let lines = self.description_lines(&body_font, note, width);
+ let lines = self.capped_lines(&body_font, note, width, most);
self.draw_text_lines(layers, &body_font, x, y, &lines, palette.muted_text, width)
}
@@ -18703,13 +18716,32 @@ impl SettingsWindow {
palette.text,
text_width,
)?;
- let extra = self.draw_row_description(
+ let mut extra = self.draw_row_description(
layers,
x,
y,
&crate::i18n::tr("settings-language-description"),
text_width,
)?;
+ // Chinese drawn in Hiragino Sans GB for want of PingFang: where to
+ // get it, under the row that chooses the language.
+ if wezterm_font::simplified_chinese_font_missing() {
+ let note_y =
+ self.settings_row_description_y(y) + self.description_line_step() + extra;
+ // Three lines, where a card's descriptions get two: it says
+ // what is wrong and what to do about it.
+ let last_note_y = note_y
+ + self.draw_row_note_in_lines(
+ layers,
+ x,
+ note_y,
+ &crate::i18n::tr("settings-language-font-missing"),
+ text_width,
+ 3,
+ )?;
+ let bottom = last_note_y + self.metrics.cell_size.height as f32 + self.ui_px(6.0);
+ extra = extra.max(bottom - (y + self.settings_row_visual_height()));
+ }
self.paint_dropdown_pill(layers, control_rect, &dropdown_label, bg, border)?;
Ok(extra)
}