Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge remote-tracking branch 'origin/main' into jp/ja-dialogs

midasdf242457f84d48
diff --cc crates/ui-egui/src/credits.rs
index 1ed050294,6704017b9..f2dc3975d
--- a/crates/ui-egui/src/credits.rs
+++ b/crates/ui-egui/src/credits.rs
@@@ -254,9 -254,9 +254,9 @@@ pub fn contributors_ui(ui: &mut egui::U
}
ui.separator();
ui.label(tr("Sort"));
- let combo = egui::ComboBox::from_id_salt("credits_sort").selected_text(tr(v.key.label().0)).show_ui(ui, |ui| {
- let combo = craft_ui::ComboBox::from_id_salt("credits_sort").selected_text(v.key.label().0).show_ui(ui, |ui| {
++ let combo = craft_ui::ComboBox::from_id_salt("credits_sort").selected_text(tr(v.key.label().0)).show_ui(ui, |ui| {
for k in SortKey::ALL {
- let r = ui.selectable_label(v.key == k, k.label().0);
+ let r = ui.selectable_label(v.key == k, tr(k.label().0));
auto.add(&format!("about.credits.sort.{}", k.id()), r.rect, k.label().0);
if r.clicked() {
v.key = k;
diff --cc crates/ui-egui/src/panels/tracker.rs
index 0751c77c6,f1c5b8b25..0a662ee60
--- a/crates/ui-egui/src/panels/tracker.rs
+++ b/crates/ui-egui/src/panels/tracker.rs
@@@ -622,8 -622,8 +622,8 @@@ pub fn apply_dialog(app: &mut Effectcra
super::dialogs::modal(ctx, "Motion Tracker Apply Options", vec2(380.0, 170.0), t, |ui| {
ui.horizontal(|ui| {
ui.label(crate::i18n::tr("Apply Dimensions:"));
- let labels = ["X and Y", "X only", "Y only"];
+ let labels = [crate::i18n::tr("X and Y"), crate::i18n::tr("X only"), crate::i18n::tr("Y only")];
- let r = egui::ComboBox::from_id_salt("track-apply-dims")
+ let r = craft_ui::ComboBox::from_id_salt("track-apply-dims")
.selected_text(labels[d.dims.min(2)])
.show_ui(ui, |ui| {
for (i, l) in labels.iter().enumerate() {