From 133b3bce7dfd8ddf7edbc963a0685a1e904329da Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:41:13 +0530 Subject: [PATCH] fix: Cancel All and Dashboard views title translations (#20173) (#20175) (cherry picked from commit 7253a10d07e7ad27f8b473af7e10fecd88080409) Co-authored-by: gsi-joel <126265080+gsi-joel@users.noreply.github.com> --- frappe/core/page/dashboard_view/dashboard_view.js | 4 ++-- frappe/public/js/frappe/form/form.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/core/page/dashboard_view/dashboard_view.js b/frappe/core/page/dashboard_view/dashboard_view.js index 8f2c56910c..0ee697dfc1 100644 --- a/frappe/core/page/dashboard_view/dashboard_view.js +++ b/frappe/core/page/dashboard_view/dashboard_view.js @@ -64,9 +64,9 @@ class Dashboard { let title = this.dashboard_name; if (!this.dashboard_name.toLowerCase().includes(__("dashboard"))) { // ensure dashboard title has "dashboard" - title = __("{0} Dashboard", [title]); + title = __("{0} Dashboard", [__(title)]); } - this.page.set_title(title); + this.page.set_title(__(title)); this.set_dropdown(); this.container.empty(); this.refresh(); diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index d1fe443f7a..47917422b5 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -906,13 +906,13 @@ frappe.ui.form.Form = class FrappeForm { .filter((link) => link.doctype == doctype) .map((link) => frappe.utils.get_form_link(link.doctype, link.name, true)) .join(", "); - links_text += `
  • ${doctype}: ${docnames}
    • `; + links_text += `
  • ${__(doctype)}: ${docnames}
    • `; } } links_text = ``; let confirm_message = __("{0} {1} is linked with the following submitted documents: {2}", [ - me.doc.doctype.bold(), + __(me.doc.doctype).bold(), me.doc.name, links_text, ]); @@ -940,7 +940,7 @@ frappe.ui.form.Form = class FrappeForm { // if user can cancel all linked docs, add action to the dialog if (can_cancel) { - d.set_primary_action("Cancel All", () => { + d.set_primary_action(__("Cancel All"), () => { d.hide(); frappe.call({ method: "frappe.desk.form.linked_with.cancel_all_linked_docs",