DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Integration: one Columns: row per catalog; Step and Repeat labels its grid columns in context
aiongg9753ced510ac
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rsindex 4679f7ba3..a9516077d 100644--- a/crates/ui-egui/src/dialogs.rs+++ b/crates/ui-egui/src/dialogs.rs@@ -5130,7 +5130,8 @@ fn step_and_repeat_dialog(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialoglet grid = d.b("grid");let fields: &[(&str, &str)] = if grid { &[("rows", "Rows:"), ("columns", "Columns:")] } else { &[("count", "Count:")] };for (k, l) in fields {- crate::rtl::label(ui, tr(l));+ // A grid's columns, not a text frame's.+ crate::rtl::label(ui, crate::i18n::tr_context(&lang, l, "grid"));text_field(ui, d, k, 70.0);ui.end_row();}diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rsindex 2e065438f..91194d1bf 100644--- a/crates/ui-egui/src/i18n.rs+++ b/crates/ui-egui/src/i18n.rs@@ -1096,7 +1096,6 @@ const TABLE: &[(&str, [&str; 5])] = &[("Count:", ["Anzahl:", "Nombre :", "Recuento:", "繰り返し数:", "计数:"]),("Create as a grid", ["Als Raster erstellen", "Créer en tant que grille", "Crear como cuadrícula", "グリッドとして作成", "创建为网格"]),("Rows:", ["Zeilen:", "Rangées :", "Filas:", "行:", "行:"]),- ("Columns:", ["Spalten:", "Colonnes :", "Columnas:", "列:", "列:"]),("Vertical:", ["Vertikal:", "Vertical :", "Vertical:", "垂直方向:", "垂直:"]),("Horizontal:", ["Horizontal:", "Horizontal :", "Horizontal:", "水平方向:", "水平:"]),("Invalid value", ["Ungültiger Wert", "Valeur non valide", "Valor no válido", "無効な値", "无效值"]),@@ -3916,6 +3915,10 @@ mod tests {assert_eq!(tr_context("uk", "Columns", "table"), "Стовпці");assert_eq!(tr("uk", "Columns"), "Колонки");assert_eq!(tr_context("uk", "Group", "selection"), "Група");+ // Step and Repeat's grid columns are not a text frame's.+ assert_eq!(tr_context("uk", "Columns:", "grid"), "Стовпці:");+ assert_eq!(tr_context("ja", "Columns:", "grid"), "列:");+ assert_eq!(tr("ja", "Columns:"), "段:");assert_eq!(tr("uk", "Group"), "Згрупувати");assert_eq!(tr_context("", "Columns", "table"), "Columns");assert_eq!(tr_context("ja", "Span Columns", "paragraphLayout"), "段抜き");diff --git a/crates/ui-egui/src/i18n/ar.rs b/crates/ui-egui/src/i18n/ar.rsindex 5962b7250..11e28aa19 100644--- a/crates/ui-egui/src/i18n/ar.rs+++ b/crates/ui-egui/src/i18n/ar.rs@@ -1064,7 +1064,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[("Count:", "العدد:"),("Create as a grid", "إنشاء كشبكة"),("Rows:", "الصفوف:"),- ("Columns:", "الأعمدة:"),("Vertical:", "رأسي:"),("Horizontal:", "أفقي:"),("Invalid value", "قيمة غير صالحة"),diff --git a/crates/ui-egui/src/i18n/it.rs b/crates/ui-egui/src/i18n/it.rsindex bd474b4b0..9dbce2297 100644--- a/crates/ui-egui/src/i18n/it.rs+++ b/crates/ui-egui/src/i18n/it.rs@@ -418,7 +418,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[("Count:", "Conteggio:"),("Create as a grid", "Crea come griglia"),("Rows:", "Righe:"),- ("Columns:", "Colonne:"),("Vertical:", "Verticale:"),("Horizontal:", "Orizzontale:"),("Invalid value", "Valore non valido"),diff --git a/crates/ui-egui/src/i18n/ja.rs b/crates/ui-egui/src/i18n/ja.rsindex 01dfb0986..ed68d4907 100644--- a/crates/ui-egui/src/i18n/ja.rs+++ b/crates/ui-egui/src/i18n/ja.rs@@ -1958,7 +1958,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[];/// Captions whose Japanese depends on where they appear: (English, context, Japanese).-pub(super) const CONTEXT: &[(&str, &str, &str)] = &[("Span Columns", "paragraphLayout", "段抜き")];+pub(super) const CONTEXT: &[(&str, &str, &str)] = &[("Span Columns", "paragraphLayout", "段抜き"), ("Columns:", "grid", "列:")];#[cfg(test)]mod tests {diff --git a/crates/ui-egui/src/i18n/pt_br.rs b/crates/ui-egui/src/i18n/pt_br.rsindex eca9d10ee..ade595b15 100644--- a/crates/ui-egui/src/i18n/pt_br.rs+++ b/crates/ui-egui/src/i18n/pt_br.rs@@ -1061,7 +1061,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[("Count:", "Contagem:"),("Create as a grid", "Criar como grade"),("Rows:", "Linhas:"),- ("Columns:", "Colunas:"),("Vertical:", "Vertical:"),("Horizontal:", "Horizontal:"),("Invalid value", "Valor inválido"),diff --git a/crates/ui-egui/src/i18n/ru.rs b/crates/ui-egui/src/i18n/ru.rsindex 695d760ff..0d2d3e6cc 100644--- a/crates/ui-egui/src/i18n/ru.rs+++ b/crates/ui-egui/src/i18n/ru.rs@@ -1728,4 +1728,4 @@ pub(super) const TABLE: &[(&str, &str)] = &[];/// Contexts whose Russian noun differs from the shared action/text-layout label.-pub(super) const CONTEXT: &[(&str, &str, &str)] = &[("Columns", "table", "Столбцы"), ("Group", "selection", "Группа")];+pub(super) const CONTEXT: &[(&str, &str, &str)] = &[("Columns", "table", "Столбцы"), ("Columns:", "grid", "Столбцы:"), ("Group", "selection", "Группа")];diff --git a/crates/ui-egui/src/i18n/uk.rs b/crates/ui-egui/src/i18n/uk.rsindex 93d648077..9da8b2c23 100644--- a/crates/ui-egui/src/i18n/uk.rs+++ b/crates/ui-egui/src/i18n/uk.rs@@ -419,7 +419,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[("Count:", "Кількість:"),("Create as a grid", "Створити як сітку"),("Rows:", "Рядки:"),- ("Columns:", "Стовпці:"),("Vertical:", "Вертикально:"),("Horizontal:", "Горизонтально:"),("Invalid value", "Неприпустиме значення"),@@ -1650,4 +1649,4 @@ pub(super) const TABLE: &[(&str, &str)] = &[];/// Contexts whose Ukrainian noun differs from the shared action/text-layout label.-pub(super) const CONTEXT: &[(&str, &str, &str)] = &[("Columns", "table", "Стовпці"), ("Group", "selection", "Група")];+pub(super) const CONTEXT: &[(&str, &str, &str)] = &[("Columns", "table", "Стовпці"), ("Columns:", "grid", "Стовпці:"), ("Group", "selection", "Група")];