瀏覽代碼

Merge pull request #3930 from robulik/master

[minor] fix of translatable terms
version-14
Rushabh Mehta 8 年之前
committed by GitHub
父節點
當前提交
5ce92a58de
共有 5 個文件被更改,包括 7 次插入7 次删除
  1. +1
    -1
      frappe/core/page/desktop/desktop.js
  2. +1
    -1
      frappe/model/delete_doc.py
  3. +2
    -2
      frappe/public/js/frappe/desk.js
  4. +2
    -2
      frappe/public/js/frappe/ui/toolbar/awesome_bar.js
  5. +1
    -1
      frappe/templates/includes/list/list.html

+ 1
- 1
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";



+ 1
- 1
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"):


+ 2
- 2
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);


+ 2
- 2
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();


+ 1
- 1
frappe/templates/includes/list/list.html 查看文件

@@ -20,7 +20,7 @@
{% endfor %}
</div>
<div class="more-block {% if not show_more -%} hide {%- endif %}">
<button class="btn btn-default btn-more btn-sm">More</button>
<button class="btn btn-default btn-more">{{ _("More") }}</button>
</div>
</div>
{%- endif %}

Loading…
取消
儲存