diff --git a/Cargo.lock b/Cargo.lock index 4628241..e6de7f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -582,7 +582,7 @@ dependencies = [ [[package]] name = "canvas-pilot" -version = "0.9.1" +version = "0.9.2" dependencies = [ "base64", "craft-dwg", diff --git a/Cargo.toml b/Cargo.toml index 9b6b835..4721ed8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"] resolver = "3" [workspace.package] -version = "0.9.1" +version = "0.9.2" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot" diff --git a/crates/canvas-pilot/locales/en.json b/crates/canvas-pilot/locales/en.json index 39e68fe..f711182 100644 --- a/crates/canvas-pilot/locales/en.json +++ b/crates/canvas-pilot/locales/en.json @@ -461,5 +461,12 @@ "access.text-scale": "Adjust text separately", "access.text-help": "Additional scaling for standard controls. Canvas artwork and fixed-size labels follow interface scale.", "access.contrast": "Use high contrast", - "access.reset": "Reset interface size" + "access.reset": "Reset interface size", + "language.name.en": "English", + "language.name.fr": "French", + "language.name.ja": "Japanese", + "language.name.zh-CN": "Simplified Chinese", + "language.name.es": "Spanish", + "language.name.grc": "Ancient Greek", + "language.name.eo": "Esperanto" } diff --git a/crates/canvas-pilot/locales/eo.json b/crates/canvas-pilot/locales/eo.json index 874509a..eead88c 100644 --- a/crates/canvas-pilot/locales/eo.json +++ b/crates/canvas-pilot/locales/eo.json @@ -461,5 +461,12 @@ "access.text-scale": "Alĝustigi tekston aparte", "access.text-help": "Plia skalo por normaj regiloj. La kanvaso kaj fiksgrandaj etikedoj sekvas la interfacan skalon.", "access.contrast": "Uzi altan kontraston", - "access.reset": "Restarigi la interfacan grandecon" + "access.reset": "Restarigi la interfacan grandecon", + "language.name.en": "Angla", + "language.name.fr": "Franca", + "language.name.ja": "Japana", + "language.name.zh-CN": "Simpligita ĉina", + "language.name.es": "Hispana", + "language.name.grc": "Antikva greka", + "language.name.eo": "Esperanto" } diff --git a/crates/canvas-pilot/locales/es.json b/crates/canvas-pilot/locales/es.json index 6f7f50f..d5f457a 100644 --- a/crates/canvas-pilot/locales/es.json +++ b/crates/canvas-pilot/locales/es.json @@ -461,5 +461,12 @@ "access.text-scale": "Ajustar el texto por separado", "access.text-help": "Escala adicional para controles estándar. El lienzo y las etiquetas de tamaño fijo siguen la escala de la interfaz.", "access.contrast": "Usar alto contraste", - "access.reset": "Restablecer el tamaño de la interfaz" + "access.reset": "Restablecer el tamaño de la interfaz", + "language.name.en": "Inglés", + "language.name.fr": "Francés", + "language.name.ja": "Japonés", + "language.name.zh-CN": "Chino simplificado", + "language.name.es": "Español", + "language.name.grc": "Griego antiguo", + "language.name.eo": "Esperanto" } diff --git a/crates/canvas-pilot/locales/fr.json b/crates/canvas-pilot/locales/fr.json index 7d1b097..9270c03 100644 --- a/crates/canvas-pilot/locales/fr.json +++ b/crates/canvas-pilot/locales/fr.json @@ -461,5 +461,12 @@ "access.text-scale": "Ajuster le texte séparément", "access.text-help": "Agrandissement supplémentaire des commandes standard. Le canevas et les libellés à taille fixe suivent l’échelle de l’interface.", "access.contrast": "Utiliser le contraste élevé", - "access.reset": "Réinitialiser la taille de l’interface" + "access.reset": "Réinitialiser la taille de l’interface", + "language.name.en": "Anglais", + "language.name.fr": "Français", + "language.name.ja": "Japonais", + "language.name.zh-CN": "Chinois simplifié", + "language.name.es": "Espagnol", + "language.name.grc": "Grec ancien", + "language.name.eo": "Espéranto" } diff --git a/crates/canvas-pilot/locales/grc.json b/crates/canvas-pilot/locales/grc.json index f5e6907..a77a664 100644 --- a/crates/canvas-pilot/locales/grc.json +++ b/crates/canvas-pilot/locales/grc.json @@ -461,5 +461,12 @@ "access.text-scale": "Τὰ γράμματα χωρὶς αὔξειν", "access.text-help": "Αὔξησις τῶν γραμμάτων τῶν συνήθων ὀργάνων. Ὁ πίναξ καὶ αἱ σταθεραὶ ἐπιγραφαὶ ἕπονται τῷ μεγέθει τῆς διεπαφῆς.", "access.contrast": "Ἰσχυρὰν ἀντίθεσιν χρῆσθαι", - "access.reset": "Τὸ μέγεθος ἀποκαθιστάναι" + "access.reset": "Τὸ μέγεθος ἀποκαθιστάναι", + "language.name.en": "Ἀγγλική", + "language.name.fr": "Γαλλική", + "language.name.ja": "Ἰαπωνική", + "language.name.zh-CN": "Σινικὴ ἁπλῆ", + "language.name.es": "Ἱσπανική", + "language.name.grc": "Ἑλληνικὴ ἀρχαία", + "language.name.eo": "Ἐσπεράντο" } diff --git a/crates/canvas-pilot/locales/ja.json b/crates/canvas-pilot/locales/ja.json index 6be5d1f..f488814 100644 --- a/crates/canvas-pilot/locales/ja.json +++ b/crates/canvas-pilot/locales/ja.json @@ -461,5 +461,12 @@ "access.text-scale": "文字サイズを個別に調整", "access.text-help": "標準コントロールの文字を拡大します。キャンバスと固定サイズのラベルはインターフェースの拡大率に従います。", "access.contrast": "高コントラストを使用", - "access.reset": "インターフェースのサイズをリセット" + "access.reset": "インターフェースのサイズをリセット", + "language.name.en": "英語", + "language.name.fr": "フランス語", + "language.name.ja": "日本語", + "language.name.zh-CN": "簡体字中国語", + "language.name.es": "スペイン語", + "language.name.grc": "古代ギリシャ語", + "language.name.eo": "エスペラント" } diff --git a/crates/canvas-pilot/locales/zh-CN.json b/crates/canvas-pilot/locales/zh-CN.json index e14b152..9928cbb 100644 --- a/crates/canvas-pilot/locales/zh-CN.json +++ b/crates/canvas-pilot/locales/zh-CN.json @@ -461,5 +461,12 @@ "access.text-scale": "单独调整文字", "access.text-help": "额外缩放标准控件文字。画布和固定大小的标签遵循界面缩放。", "access.contrast": "使用高对比度", - "access.reset": "重置界面大小" + "access.reset": "重置界面大小", + "language.name.en": "英语", + "language.name.fr": "法语", + "language.name.ja": "日语", + "language.name.zh-CN": "简体中文", + "language.name.es": "西班牙语", + "language.name.grc": "古希腊语", + "language.name.eo": "世界语" } diff --git a/crates/canvas-pilot/src/localization.rs b/crates/canvas-pilot/src/localization.rs index 61943cb..4cbd928 100644 --- a/crates/canvas-pilot/src/localization.rs +++ b/crates/canvas-pilot/src/localization.rs @@ -29,16 +29,17 @@ impl Language { ]; pub fn name(self, ctx: &egui::Context) -> String { - match self { - Self::System => tr(ctx, "language.system"), - Self::En => "English".into(), - Self::Fr => "Français".into(), - Self::Ja => "日本語".into(), - Self::ZhCn => "简体中文".into(), - Self::Es => "Español".into(), - Self::Grc => "Ἑλληνικὴ ἀρχαία".into(), - Self::Eo => "Esperanto".into(), - } + let (native, key) = match self { + Self::System => return tr(ctx, "language.system"), + Self::En => ("English", "language.name.en"), + Self::Fr => ("Français", "language.name.fr"), + Self::Ja => ("日本語", "language.name.ja"), + Self::ZhCn => ("简体中文", "language.name.zh-CN"), + Self::Es => ("Español", "language.name.es"), + Self::Grc => ("Ἑλληνικὴ ἀρχαία", "language.name.grc"), + Self::Eo => ("Esperanto", "language.name.eo"), + }; + format!("{native} — {}", tr(ctx, key)) } pub fn apply(self, ctx: &egui::Context) { @@ -157,6 +158,19 @@ mod tests { } } + #[test] + fn language_names_follow_current_locale_and_keep_native_names() { + let ctx = egui::Context::default(); + Language::Fr.apply(&ctx); + assert_eq!(Language::En.name(&ctx), "English — Anglais"); + assert_eq!(Language::Fr.name(&ctx), "Français — Français"); + assert_eq!(Language::Es.name(&ctx), "Español — Espagnol"); + Language::En.apply(&ctx); + assert_eq!(Language::Fr.name(&ctx), "Français — French"); + assert_eq!(Language::Ja.name(&ctx), "日本語 — Japanese"); + assert_eq!(Language::System.name(&ctx), tr(&ctx, "language.system")); + } + #[test] fn embedded_fonts_cover_catalogs_endonyms_and_mixed_text() { let catalogs = [ diff --git a/crates/canvas-pilot/src/preferences_ui.rs b/crates/canvas-pilot/src/preferences_ui.rs index 28850d0..0ff0d4a 100644 --- a/crates/canvas-pilot/src/preferences_ui.rs +++ b/crates/canvas-pilot/src/preferences_ui.rs @@ -457,8 +457,8 @@ mod tests { assert_eq!(app.fields, draft); assert!(!app.device.sending); } - click_label(&mut app, &ctx, "English"); - click_label(&mut app, &ctx, "Français"); + click_label(&mut app, &ctx, "English — English"); + click_label(&mut app, &ctx, "Français — French"); click_label(&mut app, &ctx, "Oui"); click_label(&mut app, &ctx, "Fermer"); assert!(!app.preferences_open); @@ -467,8 +467,8 @@ mod tests { let mut restored = Editor::with_settings(&restored_ctx, store, saved); assert_eq!(localization::locale(&restored_ctx), "fr"); restored.preferences_open = true; - click_label(&mut restored, &restored_ctx, "Français"); - click_label(&mut restored, &restored_ctx, "English"); + click_label(&mut restored, &restored_ctx, "Français — Français"); + click_label(&mut restored, &restored_ctx, "English — Anglais"); assert_eq!(localization::locale(&restored_ctx), "en"); } diff --git a/docs/canvas-pilot/changelog.md b/docs/canvas-pilot/changelog.md index 1998929..971480a 100644 --- a/docs/canvas-pilot/changelog.md +++ b/docs/canvas-pilot/changelog.md @@ -4,6 +4,11 @@ ## Unreleased +### v0.9.2 + +- Language choices show the native name followed by its name in the current + interface language, for example English — Anglais in French. + ### v0.9.1 - Added Appearance controls for 50–400% interface zoom and optional 50–200% diff --git a/docs/canvas-pilot/guide/preferences.md b/docs/canvas-pilot/guide/preferences.md index bd51831..abfab60 100644 --- a/docs/canvas-pilot/guide/preferences.md +++ b/docs/canvas-pilot/guide/preferences.md @@ -24,6 +24,8 @@ project; older projects open with captions off. ### Interface language Open **Menu → Open all settings…** and use **Language / Langue** at the top. +Each language shows its native name followed by its name in the current interface +language, for example **English — Anglais** in French. Choose **System default**, **English**, **Français**, **日本語**, **简体中文**, **Español**, **Ἑλληνικὴ ἀρχαία** (Ancient Greek), or **Esperanto**. The change takes effect immediately as a preview. Choose **Yes** within 20 seconds to save it for future