From 7484ebacb5a684234b8ecf11ca693d2683d85eb3 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 6 Dec 2022 19:53:35 +0100 Subject: [PATCH 1/2] ci(deps): install mariadb 10.6 (#19166) --- .github/helper/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh index 1df066b0bf..b8da022665 100644 --- a/.github/helper/install_dependencies.sh +++ b/.github/helper/install_dependencies.sh @@ -4,7 +4,7 @@ set -e echo "Setting Up System Dependencies..." sudo apt update -sudo apt install libcups2-dev redis-server mariadb-client-10.3 +sudo apt install libcups2-dev redis-server mariadb-client-10.6 install_wkhtmltopdf() { wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb From 6e8820e62757c1c3a8e5ba4cc38d9da7d902c164 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 6 Dec 2022 20:01:39 +0100 Subject: [PATCH 2/2] chore: translate doctype in link error (#19164) --- frappe/model/delete_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index 5e8a12c345..513a6d1e0d 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -364,7 +364,7 @@ def raise_link_exists_exception(doc, reference_doctype, reference_docname, row=" frappe.throw( _("Cannot delete or cancel because {0} {1} is linked with {2} {3} {4}").format( - doc.doctype, doc_link, reference_doctype, reference_link, row + _(doc.doctype), doc_link, _(reference_doctype), reference_link, row ), frappe.LinkExistsError, )