From ea61af2cebed536a829d3b3905a9a85ce91de955 Mon Sep 17 00:00:00 2001 From: Fisher Yu <12823863+szufisher@users.noreply.github.com> Date: Fri, 12 Apr 2024 17:09:02 +0800 Subject: [PATCH] [fix] Add missing translate function call (#25747) * Update Properties.vue * Update store.js * Update Section.vue * Update list_settings.js * Update grid_row.js * Update list_settings.js * chore: add in missing context for some strings Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com> * chore: formatting and lint fixes Signed-off-by: Akhil Narang --------- Signed-off-by: Akhil Narang Co-authored-by: Akhil Narang Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com> --- .../js/form_builder/components/Section.vue | 4 ++-- frappe/public/js/frappe/form/grid_row.js | 4 ++-- frappe/public/js/frappe/list/list_settings.js | 20 +++++++++---------- .../components/Properties.vue | 6 +++--- frappe/public/js/workflow_builder/store.js | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frappe/public/js/form_builder/components/Section.vue b/frappe/public/js/form_builder/components/Section.vue index cd5edabe06..6f01d5eaed 100644 --- a/frappe/public/js/form_builder/components/Section.vue +++ b/frappe/public/js/form_builder/components/Section.vue @@ -260,14 +260,14 @@ function delete_column(with_children) { const options = computed(() => { let groups = [ { - group: "Section", + group: __("Section"), items: [ { label: __("Add section below"), onClick: add_section_below }, { label: __("Remove section"), onClick: remove_section }, ], }, { - group: "Column", + group: __("Column"), items: [{ label: __("Add column"), onClick: add_column }], }, ]; diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index af06f2bdf8..59940c0d86 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -504,7 +504,7 @@ export default class GridRow { ); if (selectedColumn && !selectedColumn.hidden && show_field(selectedColumn.fieldtype)) { fields.push({ - label: selectedColumn.label, + label: __(selectedColumn.label, null, this.grid.doctype), value: selectedColumn.fieldname, checked: true, }); @@ -519,7 +519,7 @@ export default class GridRow { show_field(column.fieldtype) ) { fields.push({ - label: column.label, + label: __(column.label, null, this.grid.doctype), value: column.fieldname, checked: false, }); diff --git a/frappe/public/js/frappe/list/list_settings.js b/frappe/public/js/frappe/list/list_settings.js index aa1cb31427..45d10517e3 100644 --- a/frappe/public/js/frappe/list/list_settings.js +++ b/frappe/public/js/frappe/list/list_settings.js @@ -118,7 +118,7 @@ export default class ListSettings { ${frappe.utils.icon("drag", "xs", "", "", "sortable-handle " + show_sortable_handle)}
- ${me.fields[idx].label} + ${__(me.fields[idx].label, null, me.doctype)}
@@ -132,14 +132,14 @@ export default class ListSettings { fields_html.html(` @@ -209,7 +209,7 @@ export default class ListSettings { for (let idx = 0; idx < fields_order.length; idx++) { me.fields.push({ fieldname: fields_order.item(idx).getAttribute("data-fieldname"), - label: fields_order.item(idx).getAttribute("data-label"), + label: __(fields_order.item(idx).getAttribute("data-label")), }); } @@ -264,7 +264,7 @@ export default class ListSettings { let field = frappe.meta.get_docfield(me.doctype, value); if (field) { me.fields.push({ - label: field.label, + label: __(field.label, null, me.doctype), fieldname: field.fieldname, }); } @@ -320,7 +320,7 @@ export default class ListSettings { me.subject_field.fieldname != field.fieldname ) { me.fields.push({ - label: field.label, + label: __(field.label, null, me.doctype), fieldname: field.fieldname, }); } @@ -331,7 +331,7 @@ export default class ListSettings { let me = this; me.subject_field = { - label: "ID", + label: __("ID"), fieldname: "name", }; @@ -339,7 +339,7 @@ export default class ListSettings { let field = frappe.meta.get_docfield(me.doctype, meta.title_field.trim()); me.subject_field = { - label: field.label, + label: __(field.label, null, me.doctype), fieldname: field.fieldname, }; } @@ -353,7 +353,7 @@ export default class ListSettings { if (frappe.has_indicator(me.doctype)) { me.fields.push({ type: "Status", - label: "Status", + label: __("Status"), fieldname: "status_field", }); } @@ -365,7 +365,7 @@ export default class ListSettings { meta.fields.forEach((field) => { if (!frappe.model.no_value_type.includes(field.fieldtype)) { multiselect_fields.push({ - label: field.label, + label: __(field.label, null, field.doctype), value: field.fieldname, checked: fields.includes(field.fieldname), }); diff --git a/frappe/public/js/workflow_builder/components/Properties.vue b/frappe/public/js/workflow_builder/components/Properties.vue index 8167ab8299..7c505dee56 100644 --- a/frappe/public/js/workflow_builder/components/Properties.vue +++ b/frappe/public/js/workflow_builder/components/Properties.vue @@ -16,12 +16,12 @@ let properties = computed(() => { if (field.val() === "") field.focus(); }); if (store.workflow.selected && "action" in store.workflow.selected.data) { - title.value = "Transition Properties"; + title.value = __("Transition Properties"); return store.transitionfields.filter((df) => ["action", "allowed", "allow_self_approval", "condition"].includes(df.fieldname) ); } else if (store.workflow.selected && "state" in store.workflow.selected.data) { - title.value = "State Properties"; + title.value = __("State Properties"); let allow_edit = store.statefields.find((df) => df.fieldname == "allow_edit"); store.statefields = store.statefields.filter( (df) => !["allow_edit", "workflow_builder_id"].includes(df.fieldname) @@ -39,7 +39,7 @@ let properties = computed(() => { return true; }); } - title.value = "Workflow Details"; + title.value = __("Workflow Details"); return store.workflowfields.filter( (df) => !["states", "transitions", "workflow_data", "workflow_name"].includes(df.fieldname) ); diff --git a/frappe/public/js/workflow_builder/store.js b/frappe/public/js/workflow_builder/store.js index 46cda01ec9..179150fc32 100644 --- a/frappe/public/js/workflow_builder/store.js +++ b/frappe/public/js/workflow_builder/store.js @@ -80,7 +80,7 @@ export const useStore = defineStore("workflow-builder-store", () => { const workflow_data = clean_workflow_data(); doc.workflow_data = JSON.stringify(workflow_data); await frappe.call("frappe.client.save", { doc }); - frappe.toast("Workflow updated successfully"); + frappe.toast(__("Workflow updated successfully")); fetch(); } catch (e) { console.error(e);