From 545e885da2d144401942e32fb4ad1a55d760dd0d Mon Sep 17 00:00:00 2001 From: 81552433qqcom <81552433@qq.com> Date: Mon, 1 Sep 2014 21:42:58 +0800 Subject: [PATCH] various translations uses __() --- frappe/public/js/frappe/dom.js | 4 +-- frappe/public/js/frappe/form/comments.js | 2 +- frappe/public/js/frappe/form/control.js | 12 ++++---- frappe/public/js/frappe/form/link_selector.js | 6 ++-- frappe/public/js/frappe/model/model.js | 28 +++++++++---------- frappe/public/js/frappe/ui/listing.js | 2 +- frappe/public/js/frappe/ui/tags.js | 2 +- frappe/public/js/frappe/ui/toolbar/recent.js | 4 +-- frappe/public/js/frappe/ui/toolbar/toolbar.js | 2 +- .../public/js/frappe/views/communication.js | 8 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js index f4523235ef..cdaa62defc 100644 --- a/frappe/public/js/frappe/dom.js +++ b/frappe/public/js/frappe/dom.js @@ -117,8 +117,8 @@ frappe.get_modal = function(title, body_html) { \ \ \ \ diff --git a/frappe/public/js/frappe/form/comments.js b/frappe/public/js/frappe/form/comments.js index 947808004e..fbf23f07af 100644 --- a/frappe/public/js/frappe/form/comments.js +++ b/frappe/public/js/frappe/form/comments.js @@ -21,7 +21,7 @@ frappe.ui.form.Comments = Class.extend({ \
\ \ + ' + __("Add comment") + '\
\ \ ', {image: frappe.user_info(user).image, diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index dc615ffbe3..b4310465e1 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -787,11 +787,11 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ \ \ - \ + \ \ - \ + \ \ - \ + \ \ \ \ @@ -894,7 +894,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ callback: function(r) { if(frappe.model.can_create(doctype)) { r.results.push({ - value: " " + __("Create a new {0}", [me.df.options]) + "", + value: " " + __("Create a new {0}", [__(me.df.options)]) + "", make_new: true }); }; @@ -937,9 +937,9 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ } } }).data('ui-autocomplete')._renderItem = function(ul, d) { - var html = "" + d.value + ""; + var html = "" + __(d.value) + ""; if(d.description && d.value!==d.description) { - html += '
' + d.description + ''; + html += '
' + __(d.description) + ''; } return $('
  • ') .data('item.autocomplete', d) diff --git a/frappe/public/js/frappe/form/link_selector.js b/frappe/public/js/frappe/form/link_selector.js index 2a0a15320e..2d0a4de547 100644 --- a/frappe/public/js/frappe/form/link_selector.js +++ b/frappe/public/js/frappe/form/link_selector.js @@ -2,7 +2,7 @@ // MIT License. See license.txt frappe.ui.form.LinkSelector = Class.extend({ - _help: "Dialog box to select a Link Value", + _help: __("Dialog box to select a Link Value"), init: function(opts) { /* help: Options: doctype, get_query, target */ $.extend(this, opts); @@ -18,7 +18,7 @@ frappe.ui.form.LinkSelector = Class.extend({ }, make: function() { this.dialog = new frappe.ui.Dialog({ - title: "Select " + (this.doctype=='[Select]' ? "Value" : this.doctype), + title: __("Select ") + (this.doctype=='[Select]' ? __("Value") : __(this.doctype)), fields: [ { fieldtype: "Data", fieldname: "txt", label: __("Beginning with"), @@ -28,7 +28,7 @@ frappe.ui.form.LinkSelector = Class.extend({ fieldtype: "HTML", fieldname: "results" } ], - primary_action_label: "Search", + primary_action_label: __("Search"), primary_action: function() { me.search(); } diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js index e1f59d5196..d35e0c6dab 100644 --- a/frappe/public/js/frappe/model/model.js +++ b/frappe/public/js/frappe/model/model.js @@ -12,19 +12,19 @@ $.extend(frappe.model, { std_fields_list: ['name', 'owner', 'creation', 'modified', 'modified_by', '_user_tags', '_comments', 'docstatus', 'parent', 'parenttype', 'parentfield', 'idx'], std_fields: [ - {fieldname:'name', fieldtype:'Link', label:'ID'}, - {fieldname:'owner', fieldtype:'Data', label:'Created By'}, - {fieldname:'idx', fieldtype:'Int', label:'Index'}, - {fieldname:'creation', fieldtype:'Date', label:'Created On'}, - {fieldname:'modified', fieldtype:'Date', label:'Last Updated On'}, - {fieldname:'modified_by', fieldtype:'Data', label:'Last Updated By'}, - {fieldname:'_user_tags', fieldtype:'Data', label:'Tags'}, - {fieldname:'_comments', fieldtype:'Text', label:'Comments'}, - {fieldname:'docstatus', fieldtype:'Int', label:'Document Status'}, + {fieldname:'name', fieldtype:'Link', label:__('ID')}, + {fieldname:'owner', fieldtype:'Data', label:__('Created By')}, + {fieldname:'idx', fieldtype:'Int', label:__('Index')}, + {fieldname:'creation', fieldtype:'Date', label:__('Created On')}, + {fieldname:'modified', fieldtype:'Date', label:__('Last Updated On')}, + {fieldname:'modified_by', fieldtype:'Data', label:__('Last Updated By')}, + {fieldname:'_user_tags', fieldtype:'Data', label:__('Tags')}, + {fieldname:'_comments', fieldtype:'Text', label:__('Comments')}, + {fieldname:'docstatus', fieldtype:'Int', label:__('Document Status')}, ], std_fields_table: [ - {fieldname:'parent', fieldtype:'Data', label:'Parent'}, + {fieldname:'parent', fieldtype:'Data', label:__('Parent')}, ], new_names: {}, @@ -368,11 +368,11 @@ $.extend(frappe.model, { rename_doc: function(doctype, docname, callback) { var d = new frappe.ui.Dialog({ - title: "Rename " + docname, + title: __("Rename ") + __(docname), fields: [ - {label:"New Name", fieldtype:"Data", reqd:1}, - {label:"Merge with existing", fieldtype:"Check", fieldname:"merge"}, - {label:"Rename", fieldtype: "Button"} + {label:__("New Name"), fieldtype:"Data", reqd:1}, + {label:__("Merge with existing"), fieldtype:"Check", fieldname:"merge"}, + {label:__("Rename"), fieldtype: "Button"} ] }); d.get_input("rename").on("click", function() { diff --git a/frappe/public/js/frappe/ui/listing.js b/frappe/public/js/frappe/ui/listing.js index 9975cb13b0..69799cf923 100644 --- a/frappe/public/js/frappe/ui/listing.js +++ b/frappe/public/js/frappe/ui/listing.js @@ -159,7 +159,7 @@ frappe.ui.Listing = Class.extend({ // hide-refresh if(!(this.hide_refresh || this.no_refresh)) { - this.add_button('Refresh', function() { + this.add_button(__('Refresh'), function() { me.run(); }, 'icon-refresh'); diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js index 4ba5b8098f..bc8ba636e8 100644 --- a/frappe/public/js/frappe/ui/tags.js +++ b/frappe/public/js/frappe/ui/tags.js @@ -17,7 +17,7 @@ frappe.ui.TagEditor = Class.extend({ this.$tags = $('