From 67668684ab8e32f0f8fd9de209437f66c127ab0e Mon Sep 17 00:00:00 2001 From: Robert Kirschner Date: Mon, 14 Aug 2017 13:12:30 +0200 Subject: [PATCH] [minor] fix of translatable terms --- frappe/core/page/desktop/desktop.js | 2 +- frappe/model/delete_doc.py | 2 +- frappe/public/js/frappe/desk.js | 4 ++-- frappe/public/js/frappe/ui/toolbar/awesome_bar.js | 4 ++-- frappe/templates/includes/list/list.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index ad706f6c18..909f3c70fd 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -27,7 +27,7 @@ $.extend(frappe.desktop, { render: function() { var me = this; - frappe.utils.set_title("Desktop"); + frappe.utils.set_title(__("Desktop")); var template = frappe.list_desktop ? "desktop_list_view" : "desktop_icon_grid"; diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index 3e4f60c7f6..2994b7c9aa 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -168,7 +168,7 @@ def check_permission_and_not_submitted(doc): # check if submitted if doc.docstatus == 1: - frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted.").format(doc.doctype, doc.name), + frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted.").format(_(doc.doctype), doc.name), raise_exception=True) def check_if_doc_is_linked(doc, method="Delete"): diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 2816c755ad..e76ef9105e 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -92,9 +92,9 @@ frappe.Application = Class.extend({ var dialog = frappe.msgprint({ message:__("The application has been updated to a new version, please refresh this page"), indicator: 'green', - title: 'Version Updated' + title: __('Version Updated') }); - dialog.set_primary_action("Refresh", function() { + dialog.set_primary_action(__("Refresh"), function() { location.reload(true); }); dialog.get_close_btn().toggle(false); diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js index 53ca4cfff0..cd1b743735 100644 --- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js @@ -229,8 +229,8 @@ frappe.search.AwesomeBar = Class.extend({ var options = {}; options[search_field] = ["like", "%" + txt + "%"]; this.options.push({ - label: __('Find {0} in {1}', [txt.bold(), route[1].bold()]), - value: __('Find {0} in {1}', [txt, route[1]]), + label: __('Find {0} in {1}', [txt.bold(), __(route[1]).bold()]), + value: __('Find {0} in {1}', [txt, __(route[1])]), route_options: options, onclick: function() { cur_list.refresh(); diff --git a/frappe/templates/includes/list/list.html b/frappe/templates/includes/list/list.html index 23f358bdb3..3a1c72fb5d 100644 --- a/frappe/templates/includes/list/list.html +++ b/frappe/templates/includes/list/list.html @@ -20,7 +20,7 @@ {% endfor %}
- +
{%- endif %}