From bc32535668642904c215ea1fbb1ea2f15d9a5e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 26 Sep 2013 18:18:22 -0300 Subject: [PATCH 001/135] Fixin translation in selling/page/selling_home/selling_home.js --- selling/page/selling_home/selling_home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index 9697ccf985..cd8eb7225d 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -63,7 +63,7 @@ wn.module_page["Selling"] = [ "label": wn._("Selling Settings"), "route": "Form/Selling Settings", "doctype":"Selling Settings", - "description": "Settings for Selling Module" + "description": wn.("Settings for Selling Module") }, { "route":"Form/Shopping Cart Settings", From dcec039da561e7e435299e861842ccf070e12f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 26 Sep 2013 18:24:15 -0300 Subject: [PATCH 002/135] Fixin translation in selling/page/sales_browser/sales_browser.js --- selling/page/sales_browser/sales_browser.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/selling/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js index 53df1887b6..470fb68869 100644 --- a/selling/page/sales_browser/sales_browser.js +++ b/selling/page/sales_browser/sales_browser.js @@ -15,8 +15,9 @@ pscript['onload_Sales Browser'] = function(wrapper){ $(wrapper) .find(".layout-side-section") - .html('
Click on a link to get options to expand \ - get options Add / Edit / Delete.
') + .html('
'+ + wn._('Click on a link to get options to expand get options ') + + wn._('Add') + ' / ' + wn._('Edit') + ' / '+ wn._('Delete') + '.
') wrapper.make_tree = function() { var ctype = wn.get_route()[1] || 'Territory'; @@ -87,22 +88,22 @@ erpnext.SalesChart = Class.extend({ var node_links = []; if (wn.model.can_read(this.ctype)) { - node_links.push('Edit'); + node_links.push(''+wn._('Edit')+''); } if(data.expandable) { if (wn.boot.profile.can_create.indexOf(this.ctype) !== -1 || wn.boot.profile.in_create.indexOf(this.ctype) !== -1) { - node_links.push('Add Child'); + node_links.push('' + wn._('Add Child') + ''); } } if (wn.model.can_write(this.ctype)) { - node_links.push('Rename'); + node_links.push('' + wn._('Rename') + ''); }; if (wn.model.can_delete(this.ctype)) { - node_links.push('Delete'); + node_links.push('' + wn._('Delete') + ''); }; link.toolbar.append(node_links.join(" | ")); @@ -114,18 +115,18 @@ erpnext.SalesChart = Class.extend({ {fieldtype:'Data', fieldname: 'name_field', label:'New ' + me.ctype + ' Name', reqd:true}, {fieldtype:'Select', fieldname:'is_group', label:'Group Node', options:'No\nYes', - description: "Further nodes can be only created under 'Group' type nodes"}, + description: wn._("Further nodes can be only created under 'Group' type nodes")}, {fieldtype:'Button', fieldname:'create_new', label:'Create New' } ] if(me.ctype == "Sales Person") { fields.splice(-1, 0, {fieldtype:'Link', fieldname:'employee', label:'Employee', - options:'Employee', description: "Please enter Employee Id of this sales parson"}); + options:'Employee', description: wn._("Please enter Employee Id of this sales parson")}); } // the dialog var d = new wn.ui.Dialog({ - title:'New ' + me.ctype, + title: wn._('New ') + wn._(me.ctype), fields: fields }) From 629a032a7493bf4a4c1e11556d3aeb712b9cac6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 26 Sep 2013 18:41:42 -0300 Subject: [PATCH 003/135] Fix translate Customer.js --- selling/doctype/customer/customer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selling/doctype/customer/customer.js b/selling/doctype/customer/customer.js index 4e2f42c734..2b0e877360 100644 --- a/selling/doctype/customer/customer.js +++ b/selling/doctype/customer/customer.js @@ -81,7 +81,7 @@ cur_frm.cscript.make_address = function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, as_dict: 1, - no_results_message: 'No addresses created', + no_results_message: wn._('No addresses created'), render_row: cur_frm.cscript.render_address_row, }); // note: render_address_row is defined in contact_control.js @@ -99,7 +99,7 @@ cur_frm.cscript.make_contact = function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, as_dict: 1, - no_results_message: 'No contacts created', + no_results_message: wn._('No contacts created'), render_row: cur_frm.cscript.render_contact_row, }); // note: render_contact_row is defined in contact_control.js From dc3ab5c8deb1a69378ecb989ac8abd25b91c498c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 26 Sep 2013 19:12:31 -0300 Subject: [PATCH 004/135] Fixin translation in Opportunity.js --- selling/doctype/opportunity/opportunity.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js index 25f28bf3fb..8b8fbf3866 100644 --- a/selling/doctype/opportunity/opportunity.js +++ b/selling/doctype/opportunity/opportunity.js @@ -113,9 +113,9 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn){ cur_frm.clear_custom_buttons(); if(doc.docstatus === 1 && doc.status!=="Opportunity Lost") { - cur_frm.add_custom_button('Create Quotation', cur_frm.cscript.create_quotation); - cur_frm.add_custom_button('Opportunity Lost', cur_frm.cscript['Declare Opportunity Lost']); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); + cur_frm.add_custom_button( wn._('Create Quotation'), cur_frm.cscript.create_quotation); + cur_frm.add_custom_button(wn._('Opportunity Lost'), cur_frm.cscript['Declare Opportunity Lost']); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); } cur_frm.toggle_display("contact_info", doc.customer || doc.lead); @@ -181,11 +181,11 @@ cur_frm.cscript.lead = function(doc, cdt, cdn) { cur_frm.cscript['Declare Opportunity Lost'] = function(){ var dialog = new wn.ui.Dialog({ - title: "Set as Lost", + title: wn._("Set as Lost"), fields: [ - {"fieldtype": "Text", "label": "Reason for losing", "fieldname": "reason", + {"fieldtype": "Text", "label": wn._("Reason for losing"), "fieldname": "reason", "reqd": 1 }, - {"fieldtype": "Button", "label": "Update", "fieldname": "update"}, + {"fieldtype": "Button", "label": wn._("Update"), "fieldname": "update"}, ] }); @@ -198,7 +198,7 @@ cur_frm.cscript['Declare Opportunity Lost'] = function(){ args: args.reason, callback: function(r) { if(r.exc) { - msgprint("There were errors."); + msgprint(wn._("There were errors.")); return; } dialog.hide(); From 8e14a9cb93ffa468e63ee38fea9fb4175fa603fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 14:33:18 -0300 Subject: [PATCH 005/135] Fix translate Sales_Order.js --- selling/doctype/sales_order/sales_order.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js index 33699f05d8..b121f1503b 100644 --- a/selling/doctype/sales_order/sales_order.js +++ b/selling/doctype/sales_order/sales_order.js @@ -26,34 +26,34 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.dashboard.add_progress(cint(doc.per_billed) + wn._("% Billed"), doc.per_billed); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); // delivery note if(flt(doc.per_delivered, 2) < 100 && doc.order_type=='Sales') - cur_frm.add_custom_button('Make Delivery', this.make_delivery_note); + cur_frm.add_custom_button(wn._('Make Delivery'), this.make_delivery_note); // maintenance if(flt(doc.per_delivered, 2) < 100 && (doc.order_type !='Sales')) { - cur_frm.add_custom_button('Make Maint. Visit', this.make_maintenance_visit); - cur_frm.add_custom_button('Make Maint. Schedule', + cur_frm.add_custom_button(wn._('Make Maint. Visit'), this.make_maintenance_visit); + cur_frm.add_custom_button(wn._('Make Maint. Schedule'), this.make_maintenance_schedule); } // indent if(!doc.order_type || (doc.order_type == 'Sales')) - cur_frm.add_custom_button('Make ' + wn._('Material Request'), + cur_frm.add_custom_button(wn._('Make ') + wn._('Material Request'), this.make_material_request); // sales invoice if(flt(doc.per_billed, 2) < 100) - cur_frm.add_custom_button('Make Invoice', this.make_sales_invoice); + cur_frm.add_custom_button(wn._('Make Invoice'), this.make_sales_invoice); // stop if(flt(doc.per_delivered, 2) < 100 || doc.per_billed < 100) - cur_frm.add_custom_button('Stop!', cur_frm.cscript['Stop Sales Order']); + cur_frm.add_custom_button(wn._('Stop!'), cur_frm.cscript['Stop Sales Order']); } else { // un-stop - cur_frm.dashboard.set_headline_alert("Stopped", "alert-danger", "icon-stop"); - cur_frm.add_custom_button('Unstop', cur_frm.cscript['Unstop Sales Order']); + cur_frm.dashboard.set_headline_alert(wn._("Stopped"), "alert-danger", "icon-stop"); + cur_frm.add_custom_button(wn._('Unstop'), cur_frm.cscript['Unstop Sales Order']); } } @@ -157,7 +157,7 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) { cur_frm.cscript['Stop Sales Order'] = function() { var doc = cur_frm.doc; - var check = confirm("Are you sure you want to STOP " + doc.name); + var check = confirm(wn._("Are you sure you want to STOP ") + doc.name); if (check) { return $c('runserverobj', { @@ -172,7 +172,7 @@ cur_frm.cscript['Stop Sales Order'] = function() { cur_frm.cscript['Unstop Sales Order'] = function() { var doc = cur_frm.doc; - var check = confirm("Are you sure you want to UNSTOP " + doc.name); + var check = confirm(wn._("Are you sure you want to UNSTOP ") + doc.name); if (check) { return $c('runserverobj', { From 55fbeb9e9300c97444064eca15f790859cb90046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 14:40:54 -0300 Subject: [PATCH 006/135] Fix translate Lead.js --- selling/doctype/lead/lead.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js index 3c6fda7922..28507fb326 100644 --- a/selling/doctype/lead/lead.js +++ b/selling/doctype/lead/lead.js @@ -36,9 +36,9 @@ erpnext.LeadController = wn.ui.form.Controller.extend({ this.frm.__is_customer = this.frm.__is_customer || this.frm.doc.__is_customer; if(!this.frm.doc.__islocal && !this.frm.__is_customer) { - this.frm.add_custom_button("Create Customer", this.create_customer); - this.frm.add_custom_button("Create Opportunity", this.create_opportunity); - this.frm.add_custom_button("Send SMS", this.frm.cscript.send_sms); + this.frm.add_custom_button(wn._("Create Customer"), this.create_customer); + this.frm.add_custom_button(wn._("Create Opportunity"), this.create_opportunity); + this.frm.add_custom_button(wn._("Send SMS"), this.frm.cscript.send_sms); } cur_frm.communication_view = new wn.views.CommunicationList({ From 49ad416843802105c6e2502ff0c1ac46c595c300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 15:01:14 -0300 Subject: [PATCH 007/135] Fix translate Quotation.js --- selling/doctype/quotation/quotation.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js index ea1b62aa0a..90be81a257 100644 --- a/selling/doctype/quotation/quotation.js +++ b/selling/doctype/quotation/quotation.js @@ -34,11 +34,11 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({ } if(doc.docstatus == 1 && doc.status!=='Order Lost') { - cur_frm.add_custom_button('Make Sales Order', cur_frm.cscript['Make Sales Order']); + cur_frm.add_custom_button(wn._('Make Sales Order'), cur_frm.cscript['Make Sales Order']); if(doc.status!=="Order Confirmed") { - cur_frm.add_custom_button('Set as Lost', cur_frm.cscript['Declare Order Lost']); + cur_frm.add_custom_button(wn._('Set as Lost'), cur_frm.cscript['Declare Order Lost']); } - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); } if (this.frm.doc.docstatus===0) { @@ -130,9 +130,9 @@ cur_frm.cscript['Declare Order Lost'] = function(){ var dialog = new wn.ui.Dialog({ title: "Set as Lost", fields: [ - {"fieldtype": "Text", "label": "Reason for losing", "fieldname": "reason", + {"fieldtype": "Text", "label": wn._("Reason for losing"), "fieldname": "reason", "reqd": 1 }, - {"fieldtype": "Button", "label": "Update", "fieldname": "update"}, + {"fieldtype": "Button", "label": wn._("Update"), "fieldname": "update"}, ] }); @@ -145,7 +145,7 @@ cur_frm.cscript['Declare Order Lost'] = function(){ args: args.reason, callback: function(r) { if(r.exc) { - msgprint("There were errors."); + msgprint(wn._("There were errors.")); return; } dialog.hide(); From 97bf1f79db44785e1e834d4e6a59353c5ff7fb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 15:28:53 -0300 Subject: [PATCH 008/135] Fix translate Sales_bom.js --- selling/doctype/sales_bom/sales_bom.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selling/doctype/sales_bom/sales_bom.js b/selling/doctype/sales_bom/sales_bom.js index 80e66b824d..921d9d6683 100644 --- a/selling/doctype/sales_bom/sales_bom.js +++ b/selling/doctype/sales_bom/sales_bom.js @@ -4,7 +4,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_enable('new_item_code', doc.__islocal); if(!doc.__islocal) { - cur_frm.add_custom_button("Check for Duplicates", function() { + cur_frm.add_custom_button(wn._("Check for Duplicates"), function() { return cur_frm.call_server('check_duplicate', 1) }, 'icon-search') } @@ -15,8 +15,8 @@ cur_frm.fields_dict.new_item_code.get_query = function() { query: "selling.doctype.sales_bom.sales_bom.get_new_item_code" } } -cur_frm.fields_dict.new_item_code.query_description = 'Select Item where "Is Stock Item" is "No" \ - and "Is Sales Item" is "Yes" and there is no other Sales BOM'; +cur_frm.fields_dict.new_item_code.query_description = wn._('Select Item where "Is Stock Item" is "No"')+ wn._('\ + and "Is Sales Item" is "Yes" and there is no other Sales BOM'); cur_frm.cscript.item_code = function(doc, dt, dn) { var d = locals[dt][dn]; From 4098c2675f83e5ae99d0170ee638f7d5d2f4bd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 17:05:17 -0300 Subject: [PATCH 009/135] Fix translate Sales_Common.js --- selling/doctype/sales_common/sales_common.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js index dc58377e4b..20ba92a885 100644 --- a/selling/doctype/sales_common/sales_common.js +++ b/selling/doctype/sales_common/sales_common.js @@ -70,7 +70,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ this.frm.set_query("batch_no", this.fname, function(doc, cdt, cdn) { var item = wn.model.get_doc(cdt, cdn); if(!item.item_code) { - wn.throw("Please enter Item Code to get batch no"); + wn.throw(wn._("Please enter Item Code to get batch no")); } else { if(item.warehouse) { return { @@ -632,12 +632,12 @@ var set_sales_bom_help = function(doc) { $(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true); if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) { - help_msg = "
\ - For 'Sales BOM' items, warehouse, serial no and batch no \ + help_msg = "
" + + wn._("For 'Sales BOM' items, warehouse, serial no and batch no \ will be considered from the 'Packing List' table. \ If warehouse and batch no are same for all packing items for any 'Sales BOM' item, \ - those values can be entered in the main item table, values will be copied to 'Packing List' table. \ -
"; + those values can be entered in the main item table, values will be copied to 'Packing List' table.")+ + "
"; wn.meta.get_docfield(doc.doctype, 'sales_bom_help', doc.name).options = help_msg; } } else { From c5fe86c773ba5a6d61b22b36dba78dfd2059a696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 17:21:47 -0300 Subject: [PATCH 010/135] Fix Translate Sales_Analytics.js --- .../page/sales_analytics/sales_analytics.js | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/selling/page/sales_analytics/sales_analytics.js b/selling/page/sales_analytics/sales_analytics.js index 0159ae021c..daa78b40d0 100644 --- a/selling/page/sales_analytics/sales_analytics.js +++ b/selling/page/sales_analytics/sales_analytics.js @@ -4,7 +4,7 @@ wn.pages['sales-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Sales Analytics', + title: wn._('Sales Analytics'), single_column: true }); new erpnext.SalesAnalytics(wrapper); @@ -17,7 +17,7 @@ wn.pages['sales-analytics'].onload = function(wrapper) { erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ init: function(wrapper) { this._super({ - title: "Sales Analytics", + title: wn._("Sales Analytics"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -30,14 +30,14 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ this.tree_grids = { "Customer Group": { - label: "Customer Group / Customer", + label: wn._("Customer Group / Customer"), show: true, item_key: "customer", parent_field: "parent_customer_group", formatter: function(item) { return item.name; } }, "Customer": { - label: "Customer", + label: wn._("Customer"), show: false, item_key: "customer", formatter: function(item) { @@ -45,7 +45,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ } }, "Item Group": { - label: "Item", + label: wn._("Item"), show: true, parent_field: "parent_item_group", item_key: "item_code", @@ -54,7 +54,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ } }, "Item": { - label: "Item", + label: wn._("Item"), show: false, item_key: "item_code", formatter: function(item) { @@ -62,7 +62,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ } }, "Territory": { - label: "Territory / Customer", + label: wn._("Territory / Customer"), show: true, item_key: "customer", parent_field: "parent_territory", @@ -88,23 +88,23 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ this.columns = std_columns.concat(this.columns); }, filters: [ - {fieldtype:"Select", label: "Tree Type", options:["Customer Group", "Customer", + {fieldtype:"Select", label: wn._("Tree Type"), options:["Customer Group", "Customer", "Item Group", "Item", "Territory"], filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }}, - {fieldtype:"Select", label: "Based On", options:["Sales Invoice", + {fieldtype:"Select", label: wn._("Based On"), options:["Sales Invoice", "Sales Order", "Delivery Note"]}, - {fieldtype:"Select", label: "Value or Qty", options:["Value", "Quantity"]}, - {fieldtype:"Select", label: "Company", link:"Company", + {fieldtype:"Select", label: wn._("Value or Qty"), options:["Value", "Quantity"]}, + {fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: "Select Company..."}, - {fieldtype:"Date", label: "From Date"}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Select", label: "Range", + {fieldtype:"Date", label: wn._("From Date")}, + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { var me = this; From d25c46a4ed5c91a48a3bc8b249e8d00c4fd74cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 27 Sep 2013 17:51:05 -0300 Subject: [PATCH 011/135] Fix translate account.js --- accounts/doctype/account/account.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/accounts/doctype/account/account.js b/accounts/doctype/account/account.js index 9ccb16b1d9..67a46cda15 100644 --- a/accounts/doctype/account/account.js +++ b/accounts/doctype/account/account.js @@ -11,7 +11,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { // ----------------------------------------- cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.__islocal) { - msgprint("Please create new account from Chart of Accounts."); + msgprint(wn._("Please create new account from Chart of Accounts.")); throw "cannot create"; } @@ -38,7 +38,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // read-only for root accounts if(!doc.parent_account) { cur_frm.perm = [[1,0,0], [1,0,0]]; - cur_frm.set_intro("This is a root account and cannot be edited."); + cur_frm.set_intro(wn._("This is a root account and cannot be edited.")); } else { // credit days and type if customer or supplier cur_frm.set_intro(null); @@ -81,17 +81,17 @@ cur_frm.cscript.account_type = function(doc, cdt, cdn) { // Hide/unhide group or ledger // ----------------------------------------- cur_frm.cscript.add_toolbar_buttons = function(doc) { - cur_frm.add_custom_button('Chart of Accounts', + cur_frm.add_custom_button(wn._('Chart of Accounts'), function() { wn.set_route("Accounts Browser", "Account"); }, 'icon-sitemap') if (cstr(doc.group_or_ledger) == 'Group') { - cur_frm.add_custom_button('Convert to Ledger', + cur_frm.add_custom_button(wn._('Convert to Ledger'), function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet') } else if (cstr(doc.group_or_ledger) == 'Ledger') { - cur_frm.add_custom_button('Convert to Group', + cur_frm.add_custom_button(wn._('Convert to Group'), function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet') - cur_frm.add_custom_button('View Ledger', function() { + cur_frm.add_custom_button(wn._('View Ledger'), function() { wn.route_options = { "account": doc.name, "from_date": sys_defaults.year_start_date, From 14aedc92fb6665a66176493c9eab42ccac375e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 13:56:28 -0300 Subject: [PATCH 012/135] Fix translate Cost_center.js --- accounts/doctype/cost_center/cost_center.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/accounts/doctype/cost_center/cost_center.js b/accounts/doctype/cost_center/cost_center.js index c3519bfc6c..3308a1d912 100644 --- a/accounts/doctype/cost_center/cost_center.js +++ b/accounts/doctype/cost_center/cost_center.js @@ -41,8 +41,8 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_enable(['group_or_ledger', 'company'], doc.__islocal); if(!doc.__islocal && doc.group_or_ledger=='Group') { - intro_txt += '

Note: This Cost Center is a Group, \ - Accounting Entries are not allowed against groups.

'; + intro_txt += '

Note:'+ wn._('This Cost Center is a')+ ''+wn._('Group')+''+ wn._(', \ + Accounting Entries are not allowed against groups.')+'

'; } cur_frm.cscript.hide_unhide_group_ledger(doc); @@ -50,22 +50,22 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_display('sb1', doc.group_or_ledger=='Ledger') cur_frm.set_intro(intro_txt); - cur_frm.add_custom_button('Chart of Cost Centers', + cur_frm.add_custom_button(wn._('Chart of Cost Centers'), function() { wn.set_route("Accounts Browser", "Cost Center"); }, 'icon-sitemap') } cur_frm.cscript.parent_cost_center = function(doc,cdt,cdn){ if(!doc.company){ - alert('Please enter company name first'); + alert(wn._('Please enter company name first')); } } cur_frm.cscript.hide_unhide_group_ledger = function(doc) { if (cstr(doc.group_or_ledger) == 'Group') { - cur_frm.add_custom_button('Convert to Ledger', + cur_frm.add_custom_button(wn._('Convert to Ledger'), function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet') } else if (cstr(doc.group_or_ledger) == 'Ledger') { - cur_frm.add_custom_button('Convert to Group', + cur_frm.add_custom_button(wn._('Convert to Group'), function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet') } } From 9fc8e88503104412e7ed34c12b232aa07489208a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 14:33:13 -0300 Subject: [PATCH 013/135] Fix translate Fiscal_year.js --- accounts/doctype/fiscal_year/fiscal_year.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/fiscal_year/fiscal_year.js b/accounts/doctype/fiscal_year/fiscal_year.js index c5500aa1f3..ba63520e29 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.js +++ b/accounts/doctype/fiscal_year/fiscal_year.js @@ -5,8 +5,8 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.toggle_enable('year_start_date', doc.__islocal) if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) { - cur_frm.add_custom_button("Set as Default", cur_frm.cscript.set_as_default); - cur_frm.set_intro("To set this Fiscal Year as Deafult, click on 'Set as Default'"); + cur_frm.add_custom_button(wn._("Set as Default"), cur_frm.cscript.set_as_default); + cur_frm.set_intro(wn._("To set this Fiscal Year as Deafult, click on 'Set as Default'")); } else cur_frm.set_intro(""); } From 676e081ed38819d720a28946872fbda516496281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 14:36:00 -0300 Subject: [PATCH 014/135] Fix translate Cost_center.js --- accounts/doctype/cost_center/cost_center.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/cost_center/cost_center.js b/accounts/doctype/cost_center/cost_center.js index 3308a1d912..9995b6b1b5 100644 --- a/accounts/doctype/cost_center/cost_center.js +++ b/accounts/doctype/cost_center/cost_center.js @@ -41,8 +41,8 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_enable(['group_or_ledger', 'company'], doc.__islocal); if(!doc.__islocal && doc.group_or_ledger=='Group') { - intro_txt += '

Note:'+ wn._('This Cost Center is a')+ ''+wn._('Group')+''+ wn._(', \ - Accounting Entries are not allowed against groups.')+'

'; + intro_txt += '

'+wn._('Note:')+''+ wn._('This Cost Center is a')+ ''+wn._('Group')+', '+ + wn._('Accounting Entries are not allowed against groups.')+'

'; } cur_frm.cscript.hide_unhide_group_ledger(doc); From dc6cab63dcdc40b583f383f5a826ae28c48a4e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 15:03:17 -0300 Subject: [PATCH 015/135] Fix translate journal_voucher.js --- accounts/doctype/journal_voucher/journal_voucher.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index a3aa6f127a..644cec2960 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -68,7 +68,7 @@ cur_frm.cscript.refresh = function(doc) { erpnext.hide_naming_series(); cur_frm.cscript.voucher_type(doc); if(doc.docstatus==1) { - cur_frm.add_custom_button('View Ledger', function() { + cur_frm.add_custom_button(wn._('View Ledger'), function() { wn.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, @@ -156,7 +156,7 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ cur_frm.pformat.print_heading = doc.select_print_heading; } else - cur_frm.pformat.print_heading = "Journal Voucher"; + cur_frm.pformat.print_heading = wn._("Journal Voucher"); } cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { From 568ce8653edce9e5be8bae5b5a3514e440e72910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 15:13:24 -0300 Subject: [PATCH 016/135] Fix translate payment_to_invoice_matching_tool.js --- .../payment_to_invoice_matching_tool.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js index a48520cbd5..980d6e7d3c 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js @@ -13,15 +13,15 @@ cur_frm.cscript.onload_post_render = function(doc) { cur_frm.cscript.refresh = function(doc) { cur_frm.set_intro(""); if(!doc.voucher_no) { - cur_frm.set_intro("Select the Invoice against which you want to allocate payments."); + cur_frm.set_intro(wn._("Select the Invoice against which you want to allocate payments.")); } else { - cur_frm.set_intro("Set allocated amount against each Payment Entry and click 'Allocate'."); + cur_frm.set_intro(wn._("Set allocated amount against each Payment Entry and click 'Allocate'.")); } } cur_frm.fields_dict.voucher_no.get_query = function(doc) { // TO-do: check for pos, it should not come - if (!doc.account) msgprint("Please select Account first"); + if (!doc.account) msgprint(wn._("Please select Account first")); else { return { doctype: doc.voucher_type, From 46d2b9a8959deda9a4df66c2fad27716afd2dffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 15:19:16 -0300 Subject: [PATCH 017/135] Fix translate purchase_invoice.js --- accounts/doctype/purchase_invoice/purchase_invoice.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js index 2428a7dae9..40e6433fbf 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -26,10 +26,10 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ // Show / Hide button if(doc.docstatus==1 && doc.outstanding_amount > 0) - this.frm.add_custom_button('Make Payment Entry', this.make_bank_voucher); + this.frm.add_custom_button(wn._('Make Payment Entry'), this.make_bank_voucher); if(doc.docstatus==1) { - cur_frm.add_custom_button('View Ledger', function() { + cur_frm.add_custom_button(wn._('View Ledger'), function() { wn.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, @@ -213,5 +213,5 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ cur_frm.pformat.print_heading = doc.select_print_heading; } else - cur_frm.pformat.print_heading = "Purchase Invoice"; + cur_frm.pformat.print_heading = wn._("Purchase Invoice"); } \ No newline at end of file From 1a920c7ce8e95d3fc9bbbf26abf57f39c4da722a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 15:35:08 -0300 Subject: [PATCH 018/135] Fix translate purchase_taxes_and_charges_master.js --- .../purchase_taxes_and_charges_master.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js index 423c4e49b9..c8fdeaf4e4 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js @@ -60,12 +60,12 @@ cur_frm.pformat.purchase_tax_details= function(doc){ cur_frm.cscript.add_deduct_tax = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.category && d.add_deduct_tax){ - alert("Please select Category first"); + alert(wn._("Please select Category first")); d.add_deduct_tax = ''; } else if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') { console.log([d.category, d.add_deduct_tax]); - msgprint("You cannot deduct when category is for 'Valuation' or 'Valuation and Total'"); + msgprint(wn._("You cannot deduct when category is for 'Valuation' or 'Valuation and Total'")); d.add_deduct_tax = ''; } @@ -74,15 +74,15 @@ cur_frm.cscript.add_deduct_tax = function(doc, cdt, cdn) { cur_frm.cscript.charge_type = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.category && d.charge_type){ - alert("Please select Category first"); + alert(wn._("Please select Category first")); d.charge_type = ''; } else if(d.idx == 1 && (d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total')){ - alert("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"); + alert(wn._("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row")); d.charge_type = ''; } else if((d.category == 'Valuation' || d.category == 'Valuation and Total') && (d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total')){ - alert("You cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total") + alert(wn._("You cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total")) d.charge_type = ''; } validated = false; @@ -97,16 +97,16 @@ cur_frm.cscript.charge_type = function(doc, cdt, cdn) { cur_frm.cscript.row_id = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.row_id){ - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); d.row_id = ''; } else if((d.charge_type == 'Actual' || d.charge_type == 'On Net Total') && d.row_id) { - alert("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'"); + alert(wn._("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'")); d.row_id = ''; } else if((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id){ if(d.row_id >= d.idx){ - alert("You cannot Enter Row no. greater than or equal to current row no. for this Charge type"); + alert(wn._("You cannot Enter Row no. greater than or equal to current row no. for this Charge type")); d.row_id = ''; } } @@ -137,7 +137,7 @@ cur_frm.fields_dict['purchase_tax_details'].grid.get_field("cost_center").get_qu cur_frm.cscript.account_head = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.account_head){ - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); validated = false; d.account_head = ''; } @@ -151,7 +151,7 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) { cur_frm.cscript.rate = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.rate) { - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); d.rate = ''; } validated = false; @@ -161,11 +161,11 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) { cur_frm.cscript.tax_amount = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.tax_amount){ - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); d.tax_amount = ''; } else if(d.charge_type && d.tax_amount) { - alert("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate"); + alert(wn._("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate")); d.tax_amount = ''; } validated = false; From cc0ef52abd00720d5869b0f70e7a6345cfc0b444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 15:38:40 -0300 Subject: [PATCH 019/135] Fix translate sales_invoice.js --- accounts/doctype/sales_invoice/sales_invoice.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index aeae28ce03..b87f6efe4d 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -60,7 +60,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte var percent_paid = cint(flt(doc.grand_total - doc.outstanding_amount) / flt(doc.grand_total) * 100); cur_frm.dashboard.add_progress(percent_paid + "% Paid", percent_paid); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); if(cint(doc.update_stock)!=1) { // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note @@ -71,11 +71,11 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }); if(!from_delivery_note) - cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']); + cur_frm.add_custom_button(wn._('Make Delivery'), cur_frm.cscript['Make Delivery Note']); } if(doc.outstanding_amount!=0) - cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher); + cur_frm.add_custom_button(wn._('Make Payment Entry'), cur_frm.cscript.make_bank_voucher); } if (doc.docstatus===0) { From dda4e8346998b3abd10a58b8d82e942227677582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 15:43:01 -0300 Subject: [PATCH 020/135] Fix translate sales_taxes_and_charges_master.js --- .../sales_taxes_and_charges_master.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js index f1a602738b..56e64bc183 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js @@ -92,7 +92,7 @@ cur_frm.pformat.other_charges= function(doc){ cur_frm.cscript.charge_type = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(d.idx == 1 && (d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total')){ - alert("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"); + alert(wn._("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row")); d.charge_type = ''; } validated = false; @@ -105,16 +105,16 @@ cur_frm.cscript.charge_type = function(doc, cdt, cdn) { cur_frm.cscript.row_id = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.row_id){ - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); d.row_id = ''; } else if((d.charge_type == 'Actual' || d.charge_type == 'On Net Total') && d.row_id) { - alert("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'"); + alert(wn._("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'")); d.row_id = ''; } else if((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id){ if(d.row_id >= d.idx){ - alert("You cannot Enter Row no. greater than or equal to current row no. for this Charge type"); + alert(wn._("You cannot Enter Row no. greater than or equal to current row no. for this Charge type")); d.row_id = ''; } } @@ -146,7 +146,7 @@ cur_frm.fields_dict['other_charges'].grid.get_field("cost_center").get_query = f cur_frm.cscript.account_head = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.account_head){ - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); validated = false; d.account_head = ''; } @@ -160,7 +160,7 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) { cur_frm.cscript.rate = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.rate) { - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); d.rate = ''; } validated = false; @@ -170,11 +170,11 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) { cur_frm.cscript.tax_amount = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.tax_amount){ - alert("Please select Charge Type first"); + alert(wn._("Please select Charge Type first")); d.tax_amount = ''; } else if(d.charge_type && d.tax_amount) { - alert("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate"); + alert(wn._("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate")); d.tax_amount = ''; } validated = false; From 54edf12900ce306bd7f20f5020834e29f77e9885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 16:38:30 -0300 Subject: [PATCH 021/135] fix translate accounts_browser.js --- .../page/accounts_browser/accounts_browser.js | 88 ++++++++++--------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index 6b577959a1..fafe816cd9 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -20,29 +20,31 @@ pscript['onload_Accounts Browser'] = function(wrapper){ chart_area = $("
") .css({"margin-bottom": "15px"}) .appendTo(main), - help_area = $('
\ -

Quick Help

\ -
    \ -
  1. To add child nodes, explore tree and click on the node under which you \ - want to add more nodes.\ -
  2. Accounting Entries can be made against leaf nodes, called Ledgers.\ - Entries against Groups are not allowed.\ -
  3. Please do NOT create Account (Ledgers) for Customers and Suppliers. \ - They are created directly from the Customer / Supplier masters.\ -
  4. To create a Bank Account: Go to the appropriate group \ - (usually Application of Funds > Current Assets > Bank Accounts)\ - and create a new Account Ledger (by clicking on Add Child) of \ - type "Bank or Cash"\ -
  5. To create a Tax Account: Go to the appropriate group \ - (usually Source of Funds > Current Liabilities > Taxes and Duties) \ - and create a new Account Ledger (by clicking on Add Child) of type\ - "Tax" and do mention the Tax rate.\ -
\ -

Please setup your chart of accounts before you start Accounting Entries

\ -
').appendTo(main); + help_area = $('
'+ + '

'+wn._('Quick Help')+'

'+ + '
    '+ + '
  1. '+wn._('To add child nodes, explore tree and click on the node under which you want to add more nodes.')+'
    2. '+ + '
  2. '+ + wn._('Accounting Entries can be made against leaf nodes, called')+ + '' +wn._('Ledgers')+'.'+ wn._('Entries against') + + '' +wn._('Groups') + ''+ wn._('are not allowed.')+ + '
    3. '+ + '
  3. '+wn._('Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'
    4. '+ + '
  4. '+ + ''+wn._('To create a Bank Account:')+''+ + wn._('Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts)')+ + wn._('and create a new Account Ledger (by clicking on Add Child) of type "Bank or Cash"')+ + '
    5. '+ + '
  5. '+ + ''+wn._('To create a Tax Account:')+''+ + wn._('Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties)')+ + wn._('and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.')+ + '
    6. '+ + '
'+ + '

'+wn._('Please setup your chart of accounts before you start Accounting Entries')+'

').appendTo(main); if (wn.boot.profile.can_create.indexOf("Company") !== -1) { - wrapper.appframe.add_button('New Company', function() { newdoc('Company'); }, + wrapper.appframe.add_button(wn._('New Company'), function() { newdoc('Company'); }, 'icon-plus'); } @@ -145,20 +147,20 @@ erpnext.AccountsChart = Class.extend({ var node_links = []; // edit if (wn.model.can_read(this.ctype) !== -1) { - node_links.push('Edit'); + node_links.push(''+wn._('Edit')+''); } if (data.expandable && wn.boot.profile.in_create.indexOf(this.ctype) !== -1) { - node_links.push('Add Child'); + node_links.push(''+wn._('Add Child')+''); } else if (this.ctype === 'Account' && wn.boot.profile.can_read.indexOf("GL Entry") !== -1) { - node_links.push('View Ledger'); + node_links.push(''+wn._('View Ledger')+''); } if (this.can_write) { - node_links.push('Rename'); + node_links.push(''+wn._('Rename')+''); }; if (this.can_delete) { - node_links.push('Delete'); + node_links.push(''+wn._('Delete')+''); }; link.toolbar.append(node_links.join(" | ")); @@ -204,20 +206,20 @@ erpnext.AccountsChart = Class.extend({ // the dialog var d = new wn.ui.Dialog({ - title:'New Account', + title:wn._('New Account'), fields: [ - {fieldtype:'Data', fieldname:'account_name', label:'New Account Name', reqd:true, - description: "Name of new Account. Note: Please don't create accounts for Customers and Suppliers, \ - they are created automatically from the Customer and Supplier master"}, - {fieldtype:'Select', fieldname:'group_or_ledger', label:'Group or Ledger', - options:'Group\nLedger', description:'Further accounts can be made under Groups,\ - but entries can be made against Ledger'}, - {fieldtype:'Select', fieldname:'account_type', label:'Account Type', + {fieldtype:'Data', fieldname:'account_name', label:wn._('New Account Name'), reqd:true, + description: wn._("Name of new Account. Note: Please don't create accounts for Customers and Suppliers,")+ + wn._("they are created automatically from the Customer and Supplier master")}, + {fieldtype:'Select', fieldname:'group_or_ledger', label:wn._('Group or Ledger'), + options:'Group\nLedger', description: wn._('Further accounts can be made under Groups,')+ + wn._('but entries can be made against Ledger')}, + {fieldtype:'Select', fieldname:'account_type', label:wn._('Account Type'), options: ['', 'Fixed Asset Account', 'Bank or Cash', 'Expense Account', 'Tax', 'Income Account', 'Chargeable'].join('\n'), - description: "Optional. This setting will be used to filter in various transactions." }, - {fieldtype:'Float', fieldname:'tax_rate', label:'Tax Rate'}, - {fieldtype:'Button', fieldname:'create_new', label:'Create New' } + description: wn._("Optional. This setting will be used to filter in various transactions.") }, + {fieldtype:'Float', fieldname:'tax_rate', label:wn._('Tax Rate')}, + {fieldtype:'Button', fieldname:'create_new', label:wn._('Create New') } ] }) @@ -282,13 +284,13 @@ erpnext.AccountsChart = Class.extend({ var me = this; // the dialog var d = new wn.ui.Dialog({ - title:'New Cost Center', + title:wn._('New Cost Center'), fields: [ - {fieldtype:'Data', fieldname:'cost_center_name', label:'New Cost Center Name', reqd:true}, - {fieldtype:'Select', fieldname:'group_or_ledger', label:'Group or Ledger', - options:'Group\nLedger', description:'Further accounts can be made under Groups,\ - but entries can be made against Ledger'}, - {fieldtype:'Button', fieldname:'create_new', label:'Create New' } + {fieldtype:'Data', fieldname:'cost_center_name', label:wn._('New Cost Center Name'), reqd:true}, + {fieldtype:'Select', fieldname:'group_or_ledger', label:wn._('Group or Ledger'), + options:'Group\nLedger', description:wn._('Further accounts can be made under Groups,')+ + wn._('but entries can be made against Ledger')}, + {fieldtype:'Button', fieldname:'create_new', label:wn._('Create New') } ] }); From ad6679f8f123f012b48d446d3de000f26c647d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 16:42:27 -0300 Subject: [PATCH 022/135] Fix translate accounts_home.js --- accounts/page/accounts_home/accounts_home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js index d6c388335f..daf0206f65 100644 --- a/accounts/page/accounts_home/accounts_home.js +++ b/accounts/page/accounts_home/accounts_home.js @@ -130,7 +130,7 @@ wn.module_page["Accounts"] = [ { "label": wn._("Point-of-Sale Setting"), "doctype":"POS Setting", - "description": "User settings for Point-of-sale (POS)" + "description": wn._("User settings for Point-of-sale (POS)") }, { "doctype":"Budget Distribution", From 9963d5bda35e88ab313c219275a85c8a5f005b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 16:57:52 -0300 Subject: [PATCH 023/135] Fix translate financial_analytics.js --- .../financial_analytics.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/accounts/page/financial_analytics/financial_analytics.js b/accounts/page/financial_analytics/financial_analytics.js index 13b9067760..7a84dc7aef 100644 --- a/accounts/page/financial_analytics/financial_analytics.js +++ b/accounts/page/financial_analytics/financial_analytics.js @@ -6,7 +6,7 @@ wn.require("app/js/account_tree_grid.js"); wn.pages['financial-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Financial Analytics', + title: wn._('Financial Analytics'), single_column: true }); erpnext.trial_balance = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics'); @@ -18,7 +18,7 @@ wn.pages['financial-analytics'].onload = function(wrapper) { erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ filters: [ - {fieldtype:"Select", label: "PL or BS", options:["Profit and Loss", "Balance Sheet"], + {fieldtype:"Select", label: wn._("PL or BS"), options:["Profit and Loss", "Balance Sheet"], filter: function(val, item, opts, me) { if(item._show) return true; @@ -28,19 +28,19 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ return me.apply_zero_filter(val, item, opts, me); }}, - {fieldtype:"Select", label: "Company", link:"Company", default_value: "Select Company...", + {fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: "Select Company...", filter: function(val, item, opts) { return item.company == val || val == opts.default_value || item._show; }}, - {fieldtype:"Select", label: "Fiscal Year", link:"Fiscal Year", + {fieldtype:"Select", label: wn._("Fiscal Year"), link:"Fiscal Year", default_value: "Select Fiscal Year..."}, - {fieldtype:"Date", label: "From Date"}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Select", label: "Range", + {fieldtype:"Date", label: wn._("From Date")}, + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_columns: function() { var std_columns = [ From 5d1938775644d977d0bd48dcf1c3f8ee5bbd2ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:07:59 -0300 Subject: [PATCH 024/135] Fix translate financial_statements.js --- accounts/page/financial_statements/financial_statements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/financial_statements/financial_statements.js b/accounts/page/financial_statements/financial_statements.js index 48931250f2..20b7bb63e1 100644 --- a/accounts/page/financial_statements/financial_statements.js +++ b/accounts/page/financial_statements/financial_statements.js @@ -6,7 +6,7 @@ erpnext.fs = {} pscript['onload_Financial Statements'] = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - "title": "Financial Statements", + "title": wn._("Financial Statements"), "single_column": true, }); From 26b13a8a45afa0de3f2aaeb1db5b50fc4b96cc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:26:51 -0300 Subject: [PATCH 025/135] Fix translate general_ledger.js --- .../page/general_ledger/general_ledger.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index da28eb3e0a..23be75d793 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -4,7 +4,7 @@ wn.pages['general-ledger'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'General Ledger', + title: wn._('General Ledger'), single_column: true }); @@ -16,7 +16,7 @@ wn.pages['general-ledger'].onload = function(wrapper) { erpnext.GeneralLedger = wn.views.GridReport.extend({ init: function(wrapper) { this._super({ - title: "General Ledger", + title: wn._("General Ledger"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -54,11 +54,11 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ }, filters: [ - {fieldtype:"Select", label: "Company", link:"Company", default_value: "Select Company...", + {fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: "Select Company...", filter: function(val, item, opts) { return item.company == val || val == opts.default_value; }}, - {fieldtype:"Link", label: "Account", link:"Account", + {fieldtype:"Link", label: wn._("Account"), link:"Account", filter: function(val, item, opts, me) { if(!val) { return true; @@ -68,22 +68,22 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ return me.is_child_account(val, item.account); } }}, - {fieldtype:"Data", label: "Voucher No", + {fieldtype:"Data", label: wn._("Voucher No"), filter: function(val, item, opts) { if(!val) return true; return (item.voucher_no && item.voucher_no.indexOf(val)!=-1); }}, - {fieldtype:"Date", label: "From Date", filter: function(val, item) { + {fieldtype:"Date", label: wn._("From Date"), filter: function(val, item) { return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date); }}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date", filter: function(val, item) { + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date"), filter: function(val, item) { return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date); }}, - {fieldtype: "Check", label: "Group by Ledger"}, - {fieldtype: "Check", label: "Group by Voucher"}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype: "Check", label: wn._("Group by Ledger")}, + {fieldtype: "Check", label: wn._("Group by Voucher")}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { this._super(); @@ -160,7 +160,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ var to_date = dateutil.str_to_obj(this.to_date); if(to_date < from_date) { - msgprint("From Date must be before To Date"); + msgprint(wn._("From Date must be before To Date")); return; } From f2ae1bee20be54c8f64112f41c147068a5da1b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:40:19 -0300 Subject: [PATCH 026/135] Fix translate trial_balance.js --- accounts/page/trial_balance/trial_balance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js index 65212562cb..f4b8736e65 100644 --- a/accounts/page/trial_balance/trial_balance.js +++ b/accounts/page/trial_balance/trial_balance.js @@ -6,7 +6,7 @@ wn.require("app/js/account_tree_grid.js"); wn.pages['trial-balance'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Trial Balance', + title: wn._('Trial Balance'), single_column: true }); var TrialBalance = erpnext.AccountTreeGrid.extend({ From e6063695d14a4f5c36f41339db46285593160ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:46:10 -0300 Subject: [PATCH 027/135] Fix translate voucher_import_tool.js --- .../voucher_import_tool.js | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js index 5a8538e4dc..66e7fdcfdc 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.js +++ b/accounts/page/voucher_import_tool/voucher_import_tool.js @@ -4,29 +4,28 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Voucher Import Tool', + title: wn._('Voucher Import Tool'), single_column: true }); - $(wrapper).find('.layout-main').html('\ -

Import multiple accounting entries via CSV (spreadsheet) file:

\ -

1. Download Template


\ -
\ - \ -

Import multiple vouchers with one debit and one credit entry

\ -
\ -
\ - \ -

Import multiple vouchers with multiple accounts

\ -
\ -
\ -

2. Upload


\ -
\ -

Upload file in CSV format with UTF-8 encoding

\ -
\ -

\ -
\ - '); + $(wrapper).find('.layout-main').html('

'+wn._('Import multiple accounting entries via CSV (spreadsheet) file:')+'

'+ + '

'+wn._('1. Download Template')+'


'+ + '
'+ + ''+ + '

'+wn._('Import multiple vouchers with one debit and one credit entry')+'

'+ + '
'+ + '
'+ + ''+ + '

'+wn._('Import multiple vouchers with multiple accounts')+'

'+ + '
'+ + '
'+ + '

'+wn._('2. Upload')+'


'+ + '
'+ + '

'+wn._('Upload file in CSV format with UTF-8 encoding')+'

'+ + '
'+ + '

'+ + '
'+ + ''); wn.upload.make({ parent: $(wrapper).find("#voucher-upload"), From af9f4ed7fb171c36550cf1b89f4d1efb65045f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:48:51 -0300 Subject: [PATCH 028/135] Fix translate sales_person_target_variance_item_group_wise.js --- .../sales_person_target_variance_item_group_wise.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js index 5f2b89cbbd..d41adb6dde 100644 --- a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +++ b/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js @@ -5,21 +5,21 @@ wn.query_reports["Sales Person Target Variance Item Group-Wise"] = { "filters": [ { fieldname: "fiscal_year", - label: "Fiscal Year", + label: wn._("Fiscal Year"), fieldtype: "Link", options: "Fiscal Year", default: sys_defaults.fiscal_year }, { fieldname: "period", - label: "Period", + label: wn._("Period"), fieldtype: "Select", options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", default: "Monthly" }, { fieldname: "target_on", - label: "Target On", + label: wn._("Target On"), fieldtype: "Select", options: "Quantity\nAmount", default: "Quantity" From 633e3729f4f09cf8450ceb746b333b12c41a55e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:51:14 -0300 Subject: [PATCH 029/135] fix translate sales_person_wise_transaction_summary.js --- .../sales_person_wise_transaction_summary.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js index 6ddb5f97c9..1f62084f47 100644 --- a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js +++ b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js @@ -5,57 +5,57 @@ wn.query_reports["Sales Person-wise Transaction Summary"] = { "filters": [ { fieldname: "sales_person", - label: "Sales Person", + label: wn._("Sales Person"), fieldtype: "Link", options: "Sales Person" }, { fieldname: "doc_type", - label: "Document Type", + label: wn._("Document Type"), fieldtype: "Select", options: "Sales Order\nDelivery Note\nSales Invoice", default: "Sales Order" }, { fieldname: "from_date", - label: "From Date", + label: wn._("From Date"), fieldtype: "Date", default: wn.defaults.get_user_default("year_start_date"), }, { fieldname:"to_date", - label: "To Date", + label: wn._("To Date"), fieldtype: "Date", default: get_today() }, { fieldname:"company", - label: "Company", + label: wn._("Company"), fieldtype: "Link", options: "Company", default: wn.defaults.get_default("company") }, { fieldname:"item_group", - label: "Item Group", + label: wn._("Item Group"), fieldtype: "Link", options: "Item Group", }, { fieldname:"brand", - label: "Brand", + label: wn._("Brand"), fieldtype: "Link", options: "Brand", }, { fieldname:"customer", - label: "Customer", + label: wn._("Customer"), fieldtype: "Link", options: "Customer", }, { fieldname:"territory", - label: "Territory", + label: wn._("Territory"), fieldtype: "Link", options: "Territory", }, From 7339ca50f4b2bb145bd93700813d8177334677d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:53:05 -0300 Subject: [PATCH 030/135] Fix translate territory_target_variance_item_group_wise.js --- .../territory_target_variance_item_group_wise.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js index 882cdb6e83..ce2bc9f16c 100644 --- a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js +++ b/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js @@ -5,21 +5,21 @@ wn.query_reports["Territory Target Variance Item Group-Wise"] = { "filters": [ { fieldname: "fiscal_year", - label: "Fiscal Year", + label: wn._("Fiscal Year"), fieldtype: "Link", options: "Fiscal Year", default: sys_defaults.fiscal_year }, { fieldname: "period", - label: "Period", + label: wn._("Period"), fieldtype: "Select", options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", default: "Monthly" }, { fieldname: "target_on", - label: "Target On", + label: wn._("Target On"), fieldtype: "Select", options: "Quantity\nAmount", default: "Quantity" From 8bb82aeac31acd601f8d0c17b97b873e729e7857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 17:57:17 -0300 Subject: [PATCH 031/135] Fix translate accounts_payable.js --- accounts/report/accounts_payable/accounts_payable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/accounts_payable/accounts_payable.js b/accounts/report/accounts_payable/accounts_payable.js index 2c6c918e57..86516fc550 100644 --- a/accounts/report/accounts_payable/accounts_payable.js +++ b/accounts/report/accounts_payable/accounts_payable.js @@ -5,14 +5,14 @@ wn.query_reports["Accounts Payable"] = { "filters": [ { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") }, { "fieldname":"account", - "label": "Account", + "label": wn._("Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -30,13 +30,13 @@ wn.query_reports["Accounts Payable"] = { }, { "fieldname":"report_date", - "label": "Date", + "label": wn._("Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"ageing_based_on", - "label": "Ageing Based On", + "label": wn._("Ageing Based On"), "fieldtype": "Select", "options": 'Posting Date' + NEWLINE + 'Due Date', "default": "Posting Date" From 4a7b199c4de9ffa6688f3d43b6d0c7c98c704460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:06:29 -0300 Subject: [PATCH 032/135] Fix translate accounts_receivable.js --- .../report/accounts_receivable/accounts_receivable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/accounts_receivable/accounts_receivable.js b/accounts/report/accounts_receivable/accounts_receivable.js index 5f0b1901c3..65588a661b 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.js +++ b/accounts/report/accounts_receivable/accounts_receivable.js @@ -5,14 +5,14 @@ wn.query_reports["Accounts Receivable"] = { "filters": [ { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") }, { "fieldname":"account", - "label": "Account", + "label": wn._("Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -30,13 +30,13 @@ wn.query_reports["Accounts Receivable"] = { }, { "fieldname":"report_date", - "label": "Date", + "label": wn._("Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"ageing_based_on", - "label": "Ageing Based On", + "label": wn._("Ageing Based On"), "fieldtype": "Select", "options": 'Posting Date' + NEWLINE + 'Due Date', "default": "Posting Date" From 0a857b21d39b75b6a56dabd03430298f2d5301fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:07:42 -0300 Subject: [PATCH 033/135] Fix translate bank_clearance_summary.js --- .../report/bank_clearance_summary/bank_clearance_summary.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/accounts/report/bank_clearance_summary/bank_clearance_summary.js index 8e6d0c04fe..fbc973a052 100644 --- a/accounts/report/bank_clearance_summary/bank_clearance_summary.js +++ b/accounts/report/bank_clearance_summary/bank_clearance_summary.js @@ -5,20 +5,20 @@ wn.query_reports["Bank Clearance Summary"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_user_default("year_start_date"), "width": "80" }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"account", - "label": "Bank Account", + "label": wn._("Bank Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { From 2d393e36a5d4dab5e338f1fddfd090d0e5316b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:08:50 -0300 Subject: [PATCH 034/135] Fix translate bank_reconciliation_statement.js --- .../bank_reconciliation_statement.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js index bf971a7f97..420e087018 100644 --- a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js +++ b/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js @@ -5,7 +5,7 @@ wn.query_reports["Bank Reconciliation Statement"] = { "filters": [ { "fieldname":"account", - "label": "Bank Account", + "label": wn._("Bank Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -20,7 +20,7 @@ wn.query_reports["Bank Reconciliation Statement"] = { }, { "fieldname":"report_date", - "label": "Date", + "label": wn._("Date"), "fieldtype": "Date", "default": get_today() }, From 2d3041e8ae7a061bf20bc501c5b2edcd9b9d5acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:10:04 -0300 Subject: [PATCH 035/135] Fix translate budget_variance_report.js --- .../report/budget_variance_report/budget_variance_report.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/report/budget_variance_report/budget_variance_report.js b/accounts/report/budget_variance_report/budget_variance_report.js index 2ed6018268..908963fe14 100644 --- a/accounts/report/budget_variance_report/budget_variance_report.js +++ b/accounts/report/budget_variance_report/budget_variance_report.js @@ -5,21 +5,21 @@ wn.query_reports["Budget Variance Report"] = { "filters": [ { fieldname: "fiscal_year", - label: "Fiscal Year", + label: wn._("Fiscal Year"), fieldtype: "Link", options: "Fiscal Year", default: sys_defaults.fiscal_year }, { fieldname: "period", - label: "Period", + label: wn._("Period"), fieldtype: "Select", options: "Monthly\nQuarterly\nHalf-Yearly\nYearly", default: "Monthly" }, { fieldname: "company", - label: "Company", + label: wn._("Company"), fieldtype: "Link", options: "Company", default: wn.defaults.get_default("company") From c685da006126656b82d52e237818a3dd69c97dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:11:48 -0300 Subject: [PATCH 036/135] Fix translate gross_profit.js --- accounts/report/gross_profit/gross_profit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/report/gross_profit/gross_profit.js b/accounts/report/gross_profit/gross_profit.js index aea0b8a4e4..ee95f72974 100644 --- a/accounts/report/gross_profit/gross_profit.js +++ b/accounts/report/gross_profit/gross_profit.js @@ -5,20 +5,20 @@ wn.query_reports["Gross Profit"] = { "filters": [ { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_user_default("company") }, { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_user_default("year_start_date") }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": wn.defaults.get_user_default("year_end_date") }, From 40c98fb795f95ba8d2fd5e27cfa5918a6ac7baf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:13:24 -0300 Subject: [PATCH 037/135] Fix translate item_wise_purchase_register.js --- .../item_wise_purchase_register.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js index 457c9a8000..19970b7df1 100644 --- a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js +++ b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js @@ -5,26 +5,26 @@ wn.query_reports["Item-wise Purchase Register"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_user_default("year_start_date"), "width": "80" }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname": "item_code", - "label": "Item", + "label": wn._("Item"), "fieldtype": "Link", "options": "Item", }, { "fieldname":"account", - "label": "Account", + "label": wn._("Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -42,7 +42,7 @@ wn.query_reports["Item-wise Purchase Register"] = { }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From aa83cd03948d41d191421d6297700fe84d6f76b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:14:43 -0300 Subject: [PATCH 038/135] Fix translate item_wise_sales_register.js --- .../item_wise_sales_register/item_wise_sales_register.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.js b/accounts/report/item_wise_sales_register/item_wise_sales_register.js index c131fbde64..068c33dc6e 100644 --- a/accounts/report/item_wise_sales_register/item_wise_sales_register.js +++ b/accounts/report/item_wise_sales_register/item_wise_sales_register.js @@ -5,20 +5,20 @@ wn.query_reports["Item-wise Sales Register"] = wn.query_reports["Sales Register" "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_default("year_start_date"), "width": "80" }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"account", - "label": "Account", + "label": wn._("Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -36,7 +36,7 @@ wn.query_reports["Item-wise Sales Register"] = wn.query_reports["Sales Register" }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From e696cd0b6c1735d25265dda44ca9a43b349f8a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:17:35 -0300 Subject: [PATCH 039/135] Fix translate payment_collection_with_ageing.js --- .../payment_collection_with_ageing.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js b/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js index 8d8c746467..e619a43d0f 100644 --- a/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js +++ b/accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js @@ -5,20 +5,20 @@ wn.query_reports["Payment Collection With Ageing"] = { "filters": [ { "fieldname": "from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_user_default("year_start_date"), "width": "80" }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"account", - "label": "Customer Account", + "label": wn._("Customer Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -36,7 +36,7 @@ wn.query_reports["Payment Collection With Ageing"] = { }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From 2fec756fdeb12353daec169e41afcb3db0ea675a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:19:03 -0300 Subject: [PATCH 040/135] Fix translate payment_made_with_ageing.js --- .../payment_made_with_ageing/payment_made_with_ageing.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js b/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js index 7b80bdeaed..101df80a8c 100644 --- a/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js +++ b/accounts/report/payment_made_with_ageing/payment_made_with_ageing.js @@ -5,19 +5,19 @@ wn.query_reports["Payment Made With Ageing"] = { "filters": [ { fieldname: "from_date", - label: "From Date", + label: wn._("From Date"), fieldtype: "Date", default: wn.defaults.get_user_default("year_start_date"), }, { fieldname:"to_date", - label: "To Date", + label: wn._("To Date"), fieldtype: "Date", default: get_today() }, { fieldname:"account", - label: "Supplier Account", + label: wn._("Supplier Account"), fieldtype: "Link", options: "Account", get_query: function() { @@ -34,7 +34,7 @@ wn.query_reports["Payment Made With Ageing"] = { }, { fieldname:"company", - label: "Company", + label: wn._("Company"), fieldtype: "Link", options: "Company", default: wn.defaults.get_default("company") From 35fe5faba532bffed0f7b9a6a60ed21807f1f83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:19:58 -0300 Subject: [PATCH 041/135] Fix translate purchase_register.js --- accounts/report/purchase_register/purchase_register.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/purchase_register/purchase_register.js b/accounts/report/purchase_register/purchase_register.js index 5944b1a059..0bd713fd08 100644 --- a/accounts/report/purchase_register/purchase_register.js +++ b/accounts/report/purchase_register/purchase_register.js @@ -5,20 +5,20 @@ wn.query_reports["Purchase Register"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_user_default("year_start_date"), "width": "80" }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"account", - "label": "Account", + "label": wn._("Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -36,7 +36,7 @@ wn.query_reports["Purchase Register"] = { }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From 48dbeb63b8def4fde9dc4cce8c212dc1fcc146ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:21:02 -0300 Subject: [PATCH 042/135] Fix translate sales_register.js --- accounts/report/sales_register/sales_register.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/sales_register/sales_register.js b/accounts/report/sales_register/sales_register.js index 43c841f132..ab3fcd7a35 100644 --- a/accounts/report/sales_register/sales_register.js +++ b/accounts/report/sales_register/sales_register.js @@ -5,20 +5,20 @@ wn.query_reports["Sales Register"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.defaults.get_default("year_start_date"), "width": "80" }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() }, { "fieldname":"account", - "label": "Account", + "label": wn._("Account"), "fieldtype": "Link", "options": "Account", "get_query": function() { @@ -36,7 +36,7 @@ wn.query_reports["Sales Register"] = { }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From e37cc01d16c5682c2c3e844fb5b444c36016d405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 18:39:43 -0300 Subject: [PATCH 043/135] Fix translate voucher_import_tool.js --- accounts/page/voucher_import_tool/voucher_import_tool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js index 66e7fdcfdc..854617b227 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.js +++ b/accounts/page/voucher_import_tool/voucher_import_tool.js @@ -9,7 +9,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) { }); $(wrapper).find('.layout-main').html('

'+wn._('Import multiple accounting entries via CSV (spreadsheet) file:')+'

'+ - '

'+wn._('1. Download Template')+'


'+ + '

1.'+wn._(' Download Template')+'


'+ '
'+ ''+ '

'+wn._('Import multiple vouchers with one debit and one credit entry')+'

'+ @@ -19,7 +19,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) { '

'+wn._('Import multiple vouchers with multiple accounts')+'

'+ '
'+ '
'+ - '

'+wn._('2. Upload')+'


'+ + '

2.'+wn._(' Upload')+'


'+ '
'+ '

'+wn._('Upload file in CSV format with UTF-8 encoding')+'

'+ '
'+ From c52cbef184e646825cd4340141d9203b209969b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 19:02:50 -0300 Subject: [PATCH 044/135] Fix translate general_ledger.js --- .../page/general_ledger/general_ledger.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index 23be75d793..25cf840645 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -24,39 +24,40 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ }); }, setup_columns: function() { + var DEFAULT_COMPANY_VALUE = wn._("Select Company..."); this.columns = [ - {id: "posting_date", name: "Posting Date", field: "posting_date", width: 100, + {id: "posting_date", name: wn._("Posting Date"), field: "posting_date", width: 100, formatter: this.date_formatter}, - {id: "account", name: "Account", field: "account", width: 240, + {id: "account", name: wn._("Account"), field: "account", width: 240, link_formatter: { filter_input: "account", open_btn: true, doctype: "'Account'" }}, - {id: "against_account", name: "Against Account", field: "against_account", + {id: "against_account", name: wn._("Against Account"), field: "against_account", width: 240, hidden: !this.account}, - {id: "debit", name: "Debit", field: "debit", width: 100, + {id: "debit", name: wn._("Debit"), field: "debit", width: 100, formatter: this.currency_formatter}, - {id: "credit", name: "Credit", field: "credit", width: 100, + {id: "credit", name: wn._("Credit"), field: "credit", width: 100, formatter: this.currency_formatter}, - {id: "voucher_type", name: "Voucher Type", field: "voucher_type", width: 120}, - {id: "voucher_no", name: "Voucher No", field: "voucher_no", width: 160, + {id: "voucher_type", name: wn._("Voucher Type"), field: "voucher_type", width: 120}, + {id: "voucher_no", name: wn._("Voucher No"), field: "voucher_no", width: 160, link_formatter: { filter_input: "voucher_no", open_btn: true, doctype: "dataContext.voucher_type" }}, - {id: "remarks", name: "Remarks", field: "remarks", width: 200, + {id: "remarks", name: wn._("Remarks"), field: "remarks", width: 200, formatter: this.text_formatter}, ]; }, filters: [ - {fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: "Select Company...", + {fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: DEFAULT_COMPANY_VALUE, filter: function(val, item, opts) { - return item.company == val || val == opts.default_value; + return item.company == val || val == DEFAULT_COMPANY_VALUE; }}, {fieldtype:"Link", label: wn._("Account"), link:"Account", filter: function(val, item, opts, me) { From e99c5581527707728cb0af412e26b9dd2a052e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 19:04:16 -0300 Subject: [PATCH 045/135] Fix trasnlate trial_balance.js --- accounts/page/trial_balance/trial_balance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js index f4b8736e65..ec14c51e88 100644 --- a/accounts/page/trial_balance/trial_balance.js +++ b/accounts/page/trial_balance/trial_balance.js @@ -17,8 +17,8 @@ wn.pages['trial-balance'].onload = function(wrapper) { // period closing entry checkbox this.wrapper.bind("make", function() { $('
\ - With period closing entry
') + class="with_period_closing_entry">' + + wn._("With period closing entry") + '
') .appendTo(me.wrapper) .find("input").click(function() { me.refresh(); }); }); From d4279c7fe50d9fd211b7834f8100f42d26813efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 30 Sep 2013 19:05:32 -0300 Subject: [PATCH 046/135] Fix translate voucher_import_tool.js --- .../voucher_import_tool.js | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.js b/accounts/page/voucher_import_tool/voucher_import_tool.js index 854617b227..67d4aec139 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.js +++ b/accounts/page/voucher_import_tool/voucher_import_tool.js @@ -8,21 +8,27 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) { single_column: true }); - $(wrapper).find('.layout-main').html('

'+wn._('Import multiple accounting entries via CSV (spreadsheet) file:')+'

'+ - '

1.'+wn._(' Download Template')+'


'+ + $(wrapper).find('.layout-main').html('

' + + wn._('Import multiple accounting entries via CSV (spreadsheet) file:') + + '

1. ' + wn._('Download Template') + '


' + + '
' + + '' + + '

' + + wn._('Import multiple vouchers with one debit and one credit entry') + + '

'+ '
'+ - ''+ - '

'+wn._('Import multiple vouchers with one debit and one credit entry')+'

'+ - '
'+ - '
'+ - ''+ - '

'+wn._('Import multiple vouchers with multiple accounts')+'

'+ + '

' + + wn._('Import multiple vouchers with multiple accounts')+ + '

'+ '
'+ '
'+ - '

2.'+wn._(' Upload')+'


'+ + '

2. ' + wn._('Upload') + '


'+ '
'+ - '

'+wn._('Upload file in CSV format with UTF-8 encoding')+'

'+ - '
'+ + '

' + wn._('Upload file in CSV format with UTF-8 encoding') + + '

'+ '

'+ '
'+ ''); From 9b4a23312630b2da59b1cbd93e9d14ec5ba14782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 1 Oct 2013 15:23:50 -0300 Subject: [PATCH 047/135] Fix translate financial_statements.js --- accounts/page/financial_statements/financial_statements.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/financial_statements/financial_statements.js b/accounts/page/financial_statements/financial_statements.js index 20b7bb63e1..6ea2c7d329 100644 --- a/accounts/page/financial_statements/financial_statements.js +++ b/accounts/page/financial_statements/financial_statements.js @@ -45,7 +45,7 @@ pscript['onload_Financial Statements'] = function(wrapper) { $(wrapper).find(".layout-main").html('').css({"min-height": "400px"}); // load companies @@ -61,7 +61,7 @@ pscript['onload_Financial Statements'] = function(wrapper) { pscript.stmt_new = function(stmt,company_name,level,period,year) { - $i('stmt_tree').innerHTML = 'Refreshing....'; + $i('stmt_tree').innerHTML = wn._('Refreshing....'); $i('stmt_tree').style.display = 'block'; var company =erpnext.fs.stmt_company.get_value(); From 4235fa03bc27cffeb9a1af8755a401dd6efa4837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 1 Oct 2013 16:25:11 -0300 Subject: [PATCH 048/135] fix translate purchase_order.js --- buying/doctype/purchase_order/purchase_order.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js index a960046b75..fb452033c7 100644 --- a/buying/doctype/purchase_order/purchase_order.js +++ b/buying/doctype/purchase_order/purchase_order.js @@ -23,19 +23,19 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( doc.per_billed); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript['Send SMS']); if(flt(doc.per_received, 2) < 100) - cur_frm.add_custom_button('Make Purchase Receipt', this.make_purchase_receipt); + cur_frm.add_custom_button(wn._('Make Purchase Receipt'), this.make_purchase_receipt); if(flt(doc.per_billed, 2) < 100) - cur_frm.add_custom_button('Make Invoice', this.make_purchase_invoice); + cur_frm.add_custom_button(wn._('Make Invoice'), this.make_purchase_invoice); if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) - cur_frm.add_custom_button('Stop', cur_frm.cscript['Stop Purchase Order']); + cur_frm.add_custom_button(wn._('Stop'), cur_frm.cscript['Stop Purchase Order']); } else if(doc.docstatus===0) { cur_frm.cscript.add_from_mappers(); } if(doc.docstatus == 1 && doc.status == 'Stopped') - cur_frm.add_custom_button('Unstop Purchase Order', + cur_frm.add_custom_button(wn._('Unstop Purchase Order'), cur_frm.cscript['Unstop Purchase Order']); }, @@ -136,7 +136,7 @@ cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){ cur_frm.cscript['Stop Purchase Order'] = function() { var doc = cur_frm.doc; - var check = confirm("Do you really want to STOP " + doc.name); + var check = confirm(wn._("Do you really want to STOP ") + doc.name); if (check) { return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) { @@ -147,7 +147,7 @@ cur_frm.cscript['Stop Purchase Order'] = function() { cur_frm.cscript['Unstop Purchase Order'] = function() { var doc = cur_frm.doc; - var check = confirm("Do you really want to UNSTOP " + doc.name); + var check = confirm(wn._("Do you really want to UNSTOP ") + doc.name); if (check) { return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted', 'docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) { From 7d11909dde080deb7444a91f132ebee84cba2a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 1 Oct 2013 16:38:00 -0300 Subject: [PATCH 049/135] Fix translate supplier.js --- buying/doctype/supplier/supplier.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js index 75542c8257..a4c6de0277 100644 --- a/buying/doctype/supplier/supplier.js +++ b/buying/doctype/supplier/supplier.js @@ -71,7 +71,7 @@ cur_frm.cscript.make_address = function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, as_dict: 1, - no_results_message: 'No addresses created', + no_results_message: wn._('No addresses created'), render_row: cur_frm.cscript.render_address_row, }); // note: render_address_row is defined in contact_control.js @@ -89,7 +89,7 @@ cur_frm.cscript.make_contact = function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, as_dict: 1, - no_results_message: 'No contacts created', + no_results_message: wn._('No contacts created'), render_row: cur_frm.cscript.render_contact_row, }); // note: render_contact_row is defined in contact_control.js From e17417af43533c537865248ec6cb57eb811bd891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 1 Oct 2013 19:14:55 -0300 Subject: [PATCH 050/135] Fix translate delivery_note.js --- stock/doctype/delivery_note/delivery_note.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index 40d840011a..1542c7aa11 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -25,20 +25,20 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( }); if(!from_sales_invoice) - cur_frm.add_custom_button('Make Invoice', this.make_sales_invoice); + cur_frm.add_custom_button(wn._('Make Invoice'), this.make_sales_invoice); } if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1) - cur_frm.add_custom_button('Make Installation Note', this.make_installation_note); + cur_frm.add_custom_button(wn._('Make Installation Note'), this.make_installation_note); if (doc.docstatus==1) { - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); this.show_stock_ledger(); this.show_general_ledger(); } if(doc.docstatus==0 && !doc.__islocal) { - cur_frm.add_custom_button('Make Packing Slip', cur_frm.cscript['Make Packing Slip']); + cur_frm.add_custom_button(wn._('Make Packing Slip'), cur_frm.cscript['Make Packing Slip']); } set_print_hide(doc, dt, dn); From cf0f3a02d45bd346e4154f300276bf841d630ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 13:58:56 -0300 Subject: [PATCH 051/135] Fix translate item.js --- stock/doctype/item/item.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js index a83032e8f2..9d470954e7 100644 --- a/stock/doctype/item/item.js +++ b/stock/doctype/item/item.js @@ -116,7 +116,7 @@ cur_frm.fields_dict['item_group'].get_query = function(doc,cdt,cdn) { // in the "alternate_description" field cur_frm.cscript.add_image = function(doc, dt, dn) { if(!doc.image) { - msgprint('Please select an "Image" first'); + msgprint(wn._('Please select an "Image" first')); return; } @@ -132,7 +132,7 @@ cur_frm.cscript.weight_to_validate = function(doc,cdt,cdn){ if((doc.nett_weight || doc.gross_weight) && !doc.weight_uom) { - alert('Weight is mentioned,\nPlease mention "Weight UOM" too'); + alert(wn._('Weight is mentioned,\nPlease mention "Weight UOM" too')); validated=0; } } From eb331c225e4d03e52dff7f56db4e72a8036e133b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 14:03:07 -0300 Subject: [PATCH 052/135] Fix translate material_request.js --- .../material_request/material_request.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stock/doctype/material_request/material_request.js b/stock/doctype/material_request/material_request.js index 6931181dba..61be6369da 100644 --- a/stock/doctype/material_request/material_request.js +++ b/stock/doctype/material_request/material_request.js @@ -23,21 +23,21 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten if(doc.docstatus == 1 && doc.status != 'Stopped'){ if(doc.material_request_type === "Purchase") - cur_frm.add_custom_button("Make Supplier Quotation", + cur_frm.add_custom_button(wn._("Make Supplier Quotation"), this.make_supplier_quotation); if(doc.material_request_type === "Transfer" && doc.status === "Submitted") - cur_frm.add_custom_button("Transfer Material", this.make_stock_entry); + cur_frm.add_custom_button(wn._("Transfer Material"), this.make_stock_entry); if(flt(doc.per_ordered, 2) < 100) { if(doc.material_request_type === "Purchase") - cur_frm.add_custom_button('Make Purchase Order', + cur_frm.add_custom_button(wn._('Make Purchase Order'), this.make_purchase_order); - cur_frm.add_custom_button('Stop Material Request', + cur_frm.add_custom_button(wn._('Stop Material Request'), cur_frm.cscript['Stop Material Request']); } - cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); } @@ -58,7 +58,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten } if(doc.docstatus == 1 && doc.status == 'Stopped') - cur_frm.add_custom_button('Unstop Material Request', + cur_frm.add_custom_button(wn._('Unstop Material Request'), cur_frm.cscript['Unstop Material Request']); }, @@ -103,12 +103,12 @@ $.extend(cur_frm.cscript, new erpnext.buying.MaterialRequestController({frm: cur cur_frm.cscript.qty = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if (flt(d.qty) < flt(d.min_order_qty)) - alert("Warning: Material Requested Qty is less than Minimum Order Qty"); + alert(wn._("Warning: Material Requested Qty is less than Minimum Order Qty")); }; cur_frm.cscript['Stop Material Request'] = function() { var doc = cur_frm.doc; - var check = confirm("Do you really want to STOP this Material Request?"); + var check = confirm(wn._("Do you really want to STOP this Material Request?")); if (check) { return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) { @@ -119,7 +119,7 @@ cur_frm.cscript['Stop Material Request'] = function() { cur_frm.cscript['Unstop Material Request'] = function(){ var doc = cur_frm.doc; - var check = confirm("Do you really want to UNSTOP this Material Request?"); + var check = confirm(wn._("Do you really want to UNSTOP this Material Request?")); if (check) { return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) { From 1395dafb12db4080f18107a45880e617a0b95d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 14:12:43 -0300 Subject: [PATCH 053/135] Fix translate packing_slip.js --- stock/doctype/packing_slip/packing_slip.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stock/doctype/packing_slip/packing_slip.js b/stock/doctype/packing_slip/packing_slip.js index eba20c5579..f0a0ba57fc 100644 --- a/stock/doctype/packing_slip/packing_slip.js +++ b/stock/doctype/packing_slip/packing_slip.js @@ -45,13 +45,13 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) { cur_frm.cscript.validate_case_nos = function(doc) { doc = locals[doc.doctype][doc.name]; if(cint(doc.from_case_no)==0) { - msgprint("Case No. cannot be 0") + msgprint(wn._("Case No. cannot be 0")) validated = false; } else if(!cint(doc.to_case_no)) { doc.to_case_no = doc.from_case_no; refresh_field('to_case_no'); } else if(cint(doc.to_case_no) < cint(doc.from_case_no)) { - msgprint("'To Case No.' cannot be less than 'From Case No.'"); + msgprint(wn._("'To Case No.' cannot be less than 'From Case No.'")); validated = false; } } @@ -72,14 +72,14 @@ cur_frm.cscript.validate_duplicate_items = function(doc, ps_detail) { for(var i=0; i Date: Thu, 3 Oct 2013 14:18:12 -0300 Subject: [PATCH 054/135] Fix translate purchase_receipt.js --- stock/doctype/purchase_receipt/purchase_receipt.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js index 8775140a8b..24389260ca 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/stock/doctype/purchase_receipt/purchase_receipt.js @@ -16,15 +16,15 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend if(this.frm.doc.docstatus == 1) { if(!this.frm.doc.__billing_complete) { - cur_frm.add_custom_button('Make Purchase Invoice', + cur_frm.add_custom_button(wn._('Make Purchase Invoice'), this.make_purchase_invoice); } - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript['Send SMS']); this.show_stock_ledger(); this.show_general_ledger(); } else { - cur_frm.add_custom_button(wn._('From Purchase Order'), + cur_frm.add_custom_button(wn._(wn._('From Purchase Order')), function() { wn.model.map_current_doc({ method: "buying.doctype.purchase_order.purchase_order.make_purchase_receipt", @@ -139,7 +139,7 @@ cur_frm.fields_dict['purchase_receipt_details'].grid.get_field('batch_no').get_q } } else{ - alert("Please enter Item Code."); + alert(wn._("Please enter Item Code.")); } } From 995994f7c44368a16e9f496c301b2644e9f9a160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 14:57:34 -0300 Subject: [PATCH 055/135] fix translate stock_entry.js --- stock/doctype/stock_entry/stock_entry.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js index 4695fdb22c..e451f8972c 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -67,10 +67,10 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ if(this.frm.doc.docstatus === 1 && wn.boot.profile.can_create.indexOf("Journal Voucher")!==-1) { if(this.frm.doc.purpose === "Sales Return") { - this.frm.add_custom_button("Make Credit Note", function() { me.make_return_jv(); }); + this.frm.add_custom_button(wn._("Make Credit Note"), function() { me.make_return_jv(); }); this.add_excise_button(); } else if(this.frm.doc.purpose === "Purchase Return") { - this.frm.add_custom_button("Make Debit Note", function() { me.make_return_jv(); }); + this.frm.add_custom_button(wn._("Make Debit Note"), function() { me.make_return_jv(); }); this.add_excise_button(); } } @@ -191,7 +191,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ add_excise_button: function() { if(wn.boot.control_panel.country === "India") - this.frm.add_custom_button("Make Excise Invoice", function() { + this.frm.add_custom_button(wn._("Make Excise Invoice"), function() { var excise = wn.model.make_new_doc_and_get_name('Journal Voucher'); excise = locals['Journal Voucher'][excise]; excise.voucher_type = 'Excise Voucher'; @@ -307,7 +307,7 @@ cur_frm.fields_dict['mtn_details'].grid.get_field('batch_no').get_query = functi } } } else { - msgprint("Please enter Item Code to get batch no"); + msgprint(wn._("Please enter Item Code to get batch no")); } } @@ -356,7 +356,7 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) { cur_frm.cscript.validate_items = function(doc) { cl = getchildren('Stock Entry Detail',doc.name,'mtn_details'); if (!cl.length) { - alert("Item table can not be blank"); + alert(wn._("Item table can not be blank")); validated = false; } } From 8252f2a34f334db3fd416bccd839a99f21ddc86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 15:15:01 -0300 Subject: [PATCH 056/135] Fix translate stock_reconciliation.js --- .../stock_reconciliation.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js index 7373648972..481a0038ed 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -48,13 +48,13 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({ this.show_download_template(); this.show_upload(); if(this.frm.doc.reconciliation_json) { - this.frm.set_intro("You can submit this Stock Reconciliation."); + this.frm.set_intro(wn._("You can submit this Stock Reconciliation.")); } else { - this.frm.set_intro("Download the Template, fill appropriate data and \ - attach the modified file."); + this.frm.set_intro(wn._("Download the Template, fill appropriate data and \ + attach the modified file.")); } } else if(this.frm.doc.docstatus == 1) { - this.frm.set_intro("Cancelling this Stock Reconciliation will nullify its effect."); + this.frm.set_intro(wn._("Cancelling this Stock Reconciliation will nullify its effect.")); this.show_stock_ledger(); this.show_general_ledger(); } else { @@ -66,20 +66,20 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({ show_download_template: function() { var me = this; - this.frm.add_custom_button("Download Template", function() { - this.title = "Stock Reconcilation Template"; - wn.tools.downloadify([["Stock Reconciliation"], + this.frm.add_custom_button(wn._("Download Template"), function() { + this.title = wn._("Stock Reconcilation Template"); + wn.tools.downloadify([[wn._("Stock Reconciliation")], ["----"], - ["Stock Reconciliation can be used to update the stock on a particular date," - + " usually as per physical inventory."], - ["When submitted, the system creates difference entries" - + " to set the given stock and valuation on this date."], - ["It can also be used to create opening stock entries and to fix stock value."], + [wn._("Stock Reconciliation can be used to update the stock on a particular date, ") + + wn._("usually as per physical inventory.")], + [wn._("When submitted, the system creates difference entries ") + + wn._("to set the given stock and valuation on this date.")], + [wn._("It can also be used to create opening stock entries and to fix stock value.")], ["----"], - ["Notes:"], - ["Item Code and Warehouse should already exist."], - ["You can update either Quantity or Valuation Rate or both."], - ["If no change in either Quantity or Valuation Rate, leave the cell blank."], + [wn._("Notes:")], + [wn._("Item Code and Warehouse should already exist.")], + [wn._("You can update either Quantity or Valuation Rate or both.")], + [wn._("If no change in either Quantity or Valuation Rate, leave the cell blank.")], ["----"], ["Item Code", "Warehouse", "Quantity", "Valuation Rate"]], null, this); return false; @@ -113,8 +113,8 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({ show_download_reconciliation_data: function() { var me = this; if(this.frm.doc.reconciliation_json) { - this.frm.add_custom_button("Download Reconcilation Data", function() { - this.title = "Stock Reconcilation Data"; + this.frm.add_custom_button(wn._("Download Reconcilation Data"), function() { + this.title = wn._("Stock Reconcilation Data"); wn.tools.downloadify(JSON.parse(me.frm.doc.reconciliation_json), null, this); return false; }, "icon-download"); From dfe053fccd23e19de3ea7ce57a288f2b7dcceb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 15:26:36 -0300 Subject: [PATCH 057/135] Fix translate warehouse.js --- stock/doctype/warehouse/warehouse.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stock/doctype/warehouse/warehouse.js b/stock/doctype/warehouse/warehouse.js index 2a58a387f8..c33f09a9a2 100644 --- a/stock/doctype/warehouse/warehouse.js +++ b/stock/doctype/warehouse/warehouse.js @@ -7,11 +7,11 @@ cur_frm.cscript.refresh = function(doc) { cur_frm.cscript.merge = function(doc, cdt, cdn) { if (!doc.merge_with) { - msgprint("Please enter the warehouse to which you want to merge?"); + msgprint(wn._("Please enter the warehouse to which you want to merge?")); return; } - var check = confirm("Are you sure you want to merge this warehouse into " - + doc.merge_with + "?"); + var check = confirm(wn._("Are you sure you want to merge this warehouse into " + + doc.merge_with + "?")); if (check) { return $c_obj(make_doclist(cdt, cdn), 'merge_warehouses', '', ''); } From 0cd1bcf44f8c9c8ed46f4d02829738f812d91ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 15:32:35 -0300 Subject: [PATCH 058/135] Fix translate stock_ageing.js --- stock/page/stock_ageing/stock_ageing.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index 920ac848d0..98f7ace40f 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -5,7 +5,7 @@ wn.pages['stock-ageing'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Stock Ageing', + title: wn._('Stock Ageing'), single_column: true }); @@ -21,7 +21,7 @@ wn.require("app/js/stock_grid_report.js"); erpnext.StockAgeing = erpnext.StockGridReport.extend({ init: function(wrapper) { this._super({ - title: "Stock Ageing", + title: wn._("Stock Ageing"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -50,17 +50,17 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({ ]; }, filters: [ - {fieldtype:"Select", label: "Warehouse", link:"Warehouse", + {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse", default_value: "Select Warehouse..."}, - {fieldtype:"Select", label: "Brand", link:"Brand", + {fieldtype:"Select", label: wn._("Brand"), link:"Brand", default_value: "Select Brand...", filter: function(val, item, opts) { return val == opts.default_value || item.brand == val; }, link_formatter: {filter_input: "brand"}}, - {fieldtype:"Select", label: "Plot By", + {fieldtype:"Select", label: wn._("Plot By"), options: ["Average Age", "Earliest", "Latest"]}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { var me = this; From 18f91ea7de051b1396258386a6dbd5efb6b6a219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 15:41:49 -0300 Subject: [PATCH 059/135] fix translate stock_analytics.js --- stock/page/stock_analytics/stock_analytics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/page/stock_analytics/stock_analytics.js b/stock/page/stock_analytics/stock_analytics.js index 547f5ac844..d5aa219cde 100644 --- a/stock/page/stock_analytics/stock_analytics.js +++ b/stock/page/stock_analytics/stock_analytics.js @@ -5,7 +5,7 @@ wn.pages['stock-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Stock Analytics', + title: wn._('Stock Analytics'), single_column: true }); From ebb8dcf6f0262d2a9a027cad9190629ccf9a3446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 16:03:59 -0300 Subject: [PATCH 060/135] fix translate stock_balance.js --- stock/page/stock_balance/stock_balance.js | 46 +++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index 1bc5d1c6bc..9ccc028cc8 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -6,7 +6,7 @@ wn.require("app/js/stock_analytics.js"); wn.pages['stock-balance'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Stock Balance', + title: wn._('Stock Balance'), single_column: true }); @@ -20,58 +20,58 @@ wn.pages['stock-balance'].onload = function(wrapper) { erpnext.StockBalance = erpnext.StockAnalytics.extend({ init: function(wrapper) { this._super(wrapper, { - title: "Stock Balance", + title: wn._("Stock Balance"), doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", "Stock Entry", "Project"], }); }, setup_columns: function() { this.columns = [ - {id: "name", name: "Item", field: "name", width: 300, + {id: "name", name: wn._("Item"), field: "name", width: 300, formatter: this.tree_formatter}, - {id: "item_name", name: "Item Name", field: "item_name", width: 100}, - {id: "description", name: "Description", field: "description", width: 200, + {id: "item_name", name: wn._("Item Name"), field: "item_name", width: 100}, + {id: "description", name: wn._("Description"), field: "description", width: 200, formatter: this.text_formatter}, - {id: "brand", name: "Brand", field: "brand", width: 100}, - {id: "stock_uom", name: "UOM", field: "stock_uom", width: 100}, - {id: "opening_qty", name: "Opening Qty", field: "opening_qty", width: 100, + {id: "brand", name: wn._("Brand"), field: "brand", width: 100}, + {id: "stock_uom", name: wn._("UOM"), field: "stock_uom", width: 100}, + {id: "opening_qty", name: wn._("Opening Qty"), field: "opening_qty", width: 100, formatter: this.currency_formatter}, - {id: "inflow_qty", name: "In Qty", field: "inflow_qty", width: 100, + {id: "inflow_qty", name: wn._("In Qty"), field: "inflow_qty", width: 100, formatter: this.currency_formatter}, - {id: "outflow_qty", name: "Out Qty", field: "outflow_qty", width: 100, + {id: "outflow_qty", name: wn._("Out Qty"), field: "outflow_qty", width: 100, formatter: this.currency_formatter}, - {id: "closing_qty", name: "Closing Qty", field: "closing_qty", width: 100, + {id: "closing_qty", name: wn._("Closing Qty"), field: "closing_qty", width: 100, formatter: this.currency_formatter}, - {id: "opening_value", name: "Opening Value", field: "opening_value", width: 100, + {id: "opening_value", name: wn._("Opening Value"), field: "opening_value", width: 100, formatter: this.currency_formatter}, - {id: "inflow_value", name: "In Value", field: "inflow_value", width: 100, + {id: "inflow_value", name: wn._("In Value"), field: "inflow_value", width: 100, formatter: this.currency_formatter}, - {id: "outflow_value", name: "Out Value", field: "outflow_value", width: 100, + {id: "outflow_value", name: wn._("Out Value"), field: "outflow_value", width: 100, formatter: this.currency_formatter}, - {id: "closing_value", name: "Closing Value", field: "closing_value", width: 100, + {id: "closing_value", name: wn._("Closing Value"), field: "closing_value", width: 100, formatter: this.currency_formatter}, ]; }, filters: [ - {fieldtype:"Select", label: "Brand", link:"Brand", + {fieldtype:"Select", label: wn._("Brand"), link:"Brand", default_value: "Select Brand...", filter: function(val, item, opts) { return val == opts.default_value || item.brand == val || item._show; }, link_formatter: {filter_input: "brand"}}, - {fieldtype:"Select", label: "Warehouse", link:"Warehouse", + {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse", default_value: "Select Warehouse...", filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }}, - {fieldtype:"Select", label: "Project", link:"Project", + {fieldtype:"Select", label: wn._("Project"), link:"Project", default_value: "Select Project...", filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }, link_formatter: {filter_input: "project"}}, - {fieldtype:"Date", label: "From Date"}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Date", label: wn._("From Date")}, + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_plot_check: function() { From 65122328eb1656d1c74be41f627099bc98e9397d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 16:37:38 -0300 Subject: [PATCH 061/135] Fix translate stock_ledger.js --- stock/page/stock_ledger/stock_ledger.js | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js index c83fc0ec12..6607140186 100644 --- a/stock/page/stock_ledger/stock_ledger.js +++ b/stock/page/stock_ledger/stock_ledger.js @@ -4,7 +4,7 @@ wn.pages['stock-ledger'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Stock Ledger', + title: wn._('Stock Ledger'), single_column: true }); @@ -17,7 +17,7 @@ wn.require("app/js/stock_grid_report.js"); erpnext.StockLedger = erpnext.StockGridReport.extend({ init: function(wrapper) { this._super({ - title: "Stock Ledger", + title: wn._("Stock Ledger"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -28,29 +28,29 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({ setup_columns: function() { this.hide_balance = (this.is_default("item_code") || this.voucher_no) ? true : false; this.columns = [ - {id: "posting_datetime", name: "Posting Date", field: "posting_datetime", width: 120, + {id: "posting_datetime", name: wn._("Posting Date"), field: "posting_datetime", width: 120, formatter: this.date_formatter}, - {id: "item_code", name: "Item Code", field: "item_code", width: 160, + {id: "item_code", name: wn._("Item Code"), field: "item_code", width: 160, link_formatter: { filter_input: "item_code", open_btn: true, doctype: '"Item"', }}, - {id: "description", name: "Description", field: "description", width: 200, + {id: "description", name: wn._("Description"), field: "description", width: 200, formatter: this.text_formatter}, - {id: "warehouse", name: "Warehouse", field: "warehouse", width: 100, + {id: "warehouse", name: wn._("Warehouse"), field: "warehouse", width: 100, link_formatter: {filter_input: "warehouse"}}, - {id: "brand", name: "Brand", field: "brand", width: 100}, - {id: "stock_uom", name: "UOM", field: "stock_uom", width: 100}, - {id: "qty", name: "Qty", field: "qty", width: 100, + {id: "brand", name: wn._("Brand"), field: "brand", width: 100}, + {id: "stock_uom", name: wn._("UOM"), field: "stock_uom", width: 100}, + {id: "qty", name: wn._("Qty"), field: "qty", width: 100, formatter: this.currency_formatter}, - {id: "balance", name: "Balance Qty", field: "balance", width: 100, + {id: "balance", name: wn._("Balance Qty"), field: "balance", width: 100, formatter: this.currency_formatter, hidden: this.hide_balance}, - {id: "balance_value", name: "Balance Value", field: "balance_value", width: 100, + {id: "balance_value", name: wn._("Balance Value"), field: "balance_value", width: 100, formatter: this.currency_formatter, hidden: this.hide_balance}, - {id: "voucher_type", name: "Voucher Type", field: "voucher_type", width: 120}, - {id: "voucher_no", name: "Voucher No", field: "voucher_no", width: 160, + {id: "voucher_type", name: wn._("Voucher Type"), field: "voucher_type", width: 120}, + {id: "voucher_no", name: wn._("Voucher No"), field: "voucher_no", width: 160, link_formatter: { filter_input: "voucher_no", open_btn: true, @@ -60,11 +60,11 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({ }, filters: [ - {fieldtype:"Select", label: "Warehouse", link:"Warehouse", + {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse", default_value: "Select Warehouse...", filter: function(val, item, opts) { return item.warehouse == val || val == opts.default_value; }}, - {fieldtype:"Link", label: "Item Code", link:"Item", default_value: "Select Item...", + {fieldtype:"Link", label: wn._("Item Code"), link:"Item", default_value: "Select Item...", filter: function(val, item, opts) { return item.item_code == val || !val; }}, @@ -72,20 +72,20 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({ default_value: "Select Brand...", filter: function(val, item, opts) { return val == opts.default_value || item.brand == val || item._show; }, link_formatter: {filter_input: "brand"}}, - {fieldtype:"Data", label: "Voucher No", + {fieldtype:"Data", label: wn._("Voucher No"), filter: function(val, item, opts) { if(!val) return true; return (item.voucher_no && item.voucher_no.indexOf(val)!=-1); }}, - {fieldtype:"Date", label: "From Date", filter: function(val, item) { + {fieldtype:"Date", label: wn._("From Date"), filter: function(val, item) { return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date); }}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date", filter: function(val, item) { + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date"), filter: function(val, item) { return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date); }}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { From 301ce71c013c3b74943f03db927152e747e41ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 17:28:23 -0300 Subject: [PATCH 062/135] Fix translate stock_level.js --- stock/page/stock_level/stock_level.js | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index df7c8c5d4d..a6cc6a8209 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -4,7 +4,7 @@ wn.pages['stock-level'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Stock Level', + title: wn._('Stock Level'), single_column: true }); @@ -22,7 +22,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ var me = this; this._super({ - title: "Stock Level", + title: wn._("Stock Level"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -37,70 +37,70 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ Projected Qty = Actual Qty + Planned Qty + Requested Qty \ + Ordered Qty - Reserved Qty \
    \ -
  • Actual Qty: Quantity available in the warehouse.
    • \ -
  • Planned Qty: Quantity, for which, Production Order has been raised, \ - but is pending to be manufactured.
    • \ -
  • Requested Qty: Quantity requested for purchase, but not ordered.
    • \ -
  • Ordered Qty: Quantity ordered for purchase, but not received.
    • \ -
  • Reserved Qty: Quantity ordered for sale, but not delivered.
    • \ -
\ +
  • "+wn._("Actual Qty: Quantity available in the warehouse.") +"
    • "+ + "
  • "+wn._("Planned Qty: Quantity, for which, Production Order has been raised,")+ + wn._("but is pending to be manufactured.")+ "
    • " + + "
  • "+wn._("Requested Qty: Quantity requested for purchase, but not ordered.") + "
    • " + + "
  • " + wn._("Ordered Qty: Quantity ordered for purchase, but not received.")+ "
    • " + + "
  • " + wn._("Reserved Qty: Quantity ordered for sale, but not delivered.") + "
    • " + + " \ "); }); }, setup_columns: function() { this.columns = [ - {id: "item_code", name: "Item Code", field: "item_code", width: 160, + {id: "item_code", name: wn._("Item Code"), field: "item_code", width: 160, link_formatter: { filter_input: "item_code", open_btn: true, doctype: '"Item"', }}, - {id: "item_name", name: "Item Name", field: "item_name", width: 100, + {id: "item_name", name: wn._("Item Name"), field: "item_name", width: 100, formatter: this.text_formatter}, - {id: "description", name: "Description", field: "description", width: 200, + {id: "description", name: wn._("Description"), field: "description", width: 200, formatter: this.text_formatter}, - {id: "brand", name: "Brand", field: "brand", width: 100, + {id: "brand", name: wn._("Brand"), field: "brand", width: 100, link_formatter: {filter_input: "brand"}}, - {id: "warehouse", name: "Warehouse", field: "warehouse", width: 100, + {id: "warehouse", name: wn._("Warehouse"), field: "warehouse", width: 100, link_formatter: {filter_input: "warehouse"}}, - {id: "uom", name: "UOM", field: "uom", width: 60}, - {id: "actual_qty", name: "Actual Qty", + {id: "uom", name: wn._("UOM"), field: "uom", width: 60}, + {id: "actual_qty", name: wn._("Actual Qty"), field: "actual_qty", width: 80, formatter: this.currency_formatter}, - {id: "planned_qty", name: "Planned Qty", + {id: "planned_qty", name: wn._("Planned Qty"), field: "planned_qty", width: 80, formatter: this.currency_formatter}, - {id: "requested_qty", name: "Requested Qty", + {id: "requested_qty", name: wn._("Requested Qty"), field: "requested_qty", width: 80, formatter: this.currency_formatter}, - {id: "ordered_qty", name: "Ordered Qty", + {id: "ordered_qty", name: wn._("Ordered Qty"), field: "ordered_qty", width: 80, formatter: this.currency_formatter}, - {id: "reserved_qty", name: "Reserved Qty", + {id: "reserved_qty", name: wn._("Reserved Qty"), field: "reserved_qty", width: 80, formatter: this.currency_formatter}, - {id: "projected_qty", name: "Projected Qty", + {id: "projected_qty", name: wn._("Projected Qty"), field: "projected_qty", width: 80, formatter: this.currency_formatter}, - {id: "re_order_level", name: "Re-Order Level", + {id: "re_order_level", name: wn._("Re-Order Level"), field: "re_order_level", width: 80, formatter: this.currency_formatter}, - {id: "re_order_qty", name: "Re-Order Qty", + {id: "re_order_qty", name: wn._("Re-Order Qty"), field: "re_order_qty", width: 80, formatter: this.currency_formatter}, ]; }, filters: [ - {fieldtype:"Link", label: "Item Code", link:"Item", default_value: "Select Item...", + {fieldtype:"Link", label: wn._("Item Code"), link:"Item", default_value: "Select Item...", filter: function(val, item, opts) { return item.item_code == val || !val; }}, - {fieldtype:"Select", label: "Warehouse", link:"Warehouse", + {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse", default_value: "Select Warehouse...", filter: function(val, item, opts) { return item.warehouse == val || val == opts.default_value; }}, - {fieldtype:"Select", label: "Brand", link:"Brand", + {fieldtype:"Select", label: wn._("Brand"), link:"Brand", default_value: "Select Brand...", filter: function(val, item, opts) { return val == opts.default_value || item.brand == val; }}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { From 7090383de47b219f53184af720c937967e72d608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 17:32:34 -0300 Subject: [PATCH 063/135] Fix translate batch_wise_balance_history.js --- .../batch_wise_balance_history/batch_wise_balance_history.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/stock/report/batch_wise_balance_history/batch_wise_balance_history.js index a9d6477754..2b174872b2 100644 --- a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js +++ b/stock/report/batch_wise_balance_history/batch_wise_balance_history.js @@ -5,14 +5,14 @@ wn.query_reports["Batch-Wise Balance History"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "width": "80", "default": sys_defaults.year_start_date, }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "width": "80", "default": wn.datetime.get_today() From d2cdf7a2db31be9eeca2248804659089230f1245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 17:33:33 -0300 Subject: [PATCH 064/135] Fix translate itemwise_recommended_reorder_level.js --- .../itemwise_recommended_reorder_level.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js index 410feabf75..c22672865c 100644 --- a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js +++ b/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js @@ -5,13 +5,13 @@ wn.query_reports["Itemwise Recommended Reorder Level"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": sys_defaults.year_start_date }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": get_today() } From 7ce0267f8f50cafd5b3f88fc419f843934476315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Thu, 3 Oct 2013 17:36:12 -0300 Subject: [PATCH 065/135] fix translate warehouse_wise_stock_balance.js --- .../warehouse_wise_stock_balance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js index 942b4651bf..1b0523cc12 100644 --- a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js +++ b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js @@ -5,14 +5,14 @@ wn.query_reports["Warehouse-Wise Stock Balance"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "width": "80", "default": sys_defaults.year_start_date, }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "width": "80", "default": wn.datetime.get_today() From a42d32f4c58777f644b9e9e0f26def2f76a16045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 14:07:56 -0300 Subject: [PATCH 066/135] Fix translate selling_home.js --- selling/page/selling_home/selling_home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js index cd8eb7225d..b4e93054cc 100644 --- a/selling/page/selling_home/selling_home.js +++ b/selling/page/selling_home/selling_home.js @@ -63,7 +63,7 @@ wn.module_page["Selling"] = [ "label": wn._("Selling Settings"), "route": "Form/Selling Settings", "doctype":"Selling Settings", - "description": wn.("Settings for Selling Module") + "description": wn._("Settings for Selling Module") }, { "route":"Form/Shopping Cart Settings", From e47cc0408cac50d01ad25728d505296ed6efceb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:06:55 -0300 Subject: [PATCH 067/135] Fix translate bom.js --- manufacturing/doctype/bom/bom.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manufacturing/doctype/bom/bom.js b/manufacturing/doctype/bom/bom.js index badb108048..020325867a 100644 --- a/manufacturing/doctype/bom/bom.js +++ b/manufacturing/doctype/bom/bom.js @@ -6,7 +6,7 @@ cur_frm.cscript.refresh = function(doc,dt,dn){ cur_frm.toggle_enable("item", doc.__islocal); if (!doc.__islocal && doc.docstatus<2) { - cur_frm.add_custom_button("Update Cost", cur_frm.cscript.update_cost); + cur_frm.add_custom_button(wn._("Update Cost"), cur_frm.cscript.update_cost); } cur_frm.cscript.with_operations(doc); @@ -123,7 +123,7 @@ cur_frm.cscript.qty = function(doc, cdt, cdn) { cur_frm.cscript.rate = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if (d.bom_no) { - msgprint("You can not change rate if BOM mentioned agianst any item"); + msgprint(wn._("You can not change rate if BOM mentioned agianst any item")); get_bom_material_detail(doc, cdt, cdn); } else { calculate_rm_cost(doc); From e582ac4eea09caed23742e66bbe3f68c7519a5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:09:54 -0300 Subject: [PATCH 068/135] Fix translate production_order.js --- .../doctype/production_order/production_order.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manufacturing/doctype/production_order/production_order.js b/manufacturing/doctype/production_order/production_order.js index f680776a56..7c4325dc37 100644 --- a/manufacturing/doctype/production_order/production_order.js +++ b/manufacturing/doctype/production_order/production_order.js @@ -13,7 +13,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cfn_set_fields(doc, dt, dn); if(doc.docstatus===0 && !doc.__islocal) { - cur_frm.set_intro("Submit this Production Order for further processing."); + cur_frm.set_intro(wn._("Submit this Production Order for further processing.")); } else if(doc.docstatus===1) { var percent = flt(doc.produced_qty) / flt(doc.qty) * 100; cur_frm.dashboard.add_progress(cint(percent) + "% " + wn._("Complete"), percent); @@ -27,13 +27,13 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { var cfn_set_fields = function(doc, dt, dn) { if (doc.docstatus == 1) { if (doc.status != 'Stopped' && doc.status != 'Completed') - cur_frm.add_custom_button('Stop!', cur_frm.cscript['Stop Production Order']); + cur_frm.add_custom_button(wn._('Stop!'), cur_frm.cscript['Stop Production Order']); else if (doc.status == 'Stopped') - cur_frm.add_custom_button('Unstop', cur_frm.cscript['Unstop Production Order']); + cur_frm.add_custom_button(wn._('Unstop'), cur_frm.cscript['Unstop Production Order']); if (doc.status == 'Submitted' || doc.status == 'Material Transferred' || doc.status == 'In Process'){ - cur_frm.add_custom_button('Transfer Raw Materials', cur_frm.cscript['Transfer Raw Materials']); - cur_frm.add_custom_button('Update Finished Goods', cur_frm.cscript['Update Finished Goods']); + cur_frm.add_custom_button(wn._('Transfer Raw Materials'), cur_frm.cscript['Transfer Raw Materials']); + cur_frm.add_custom_button(wn._('Update Finished Goods'), cur_frm.cscript['Update Finished Goods']); } } } @@ -47,7 +47,7 @@ cur_frm.cscript.production_item = function(doc) { cur_frm.cscript['Stop Production Order'] = function() { var doc = cur_frm.doc; - var check = confirm("Do you really want to stop production order: " + doc.name); + var check = confirm(wn._("Do you really want to stop production order: " + doc.name)); if (check) { return $c_obj(make_doclist(doc.doctype, doc.name), 'stop_unstop', 'Stopped', function(r, rt) {cur_frm.refresh();}); } @@ -55,7 +55,7 @@ cur_frm.cscript['Stop Production Order'] = function() { cur_frm.cscript['Unstop Production Order'] = function() { var doc = cur_frm.doc; - var check = confirm("Do really want to unstop production order: " + doc.name); + var check = confirm(wn._("Do really want to unstop production order: " + doc.name)); if (check) return $c_obj(make_doclist(doc.doctype, doc.name), 'stop_unstop', 'Unstopped', function(r, rt) {cur_frm.refresh();}); } @@ -105,5 +105,5 @@ cur_frm.set_query("bom_no", function(doc) { query:"controllers.queries.bom", filters: {item: cstr(doc.production_item)} } - } else msgprint(" Please enter Production Item first"); + } else msgprint(wn._("Please enter Production Item first")); }); \ No newline at end of file From 328f384cdc69f4226f84a7488497b2ad3ffc9ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:11:58 -0300 Subject: [PATCH 069/135] Fix translate production_planning_tool.js --- .../production_planning_tool/production_planning_tool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/manufacturing/doctype/production_planning_tool/production_planning_tool.js index daa701352b..22bf6caef4 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.js +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.js @@ -44,7 +44,7 @@ cur_frm.fields_dict['pp_details'].grid.get_field('bom_no').get_query = function( query:"controllers.queries.bom", filters:{'item': cstr(d.item_code)} } - } else msgprint(" Please enter Item first"); + } else msgprint(wn._("Please enter Item first")); } cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) { From 247ae8c6e53497ae1b0d15aafc6b805c168d24d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:24:42 -0300 Subject: [PATCH 070/135] Fix translate customer_issue.js --- support/doctype/customer_issue/customer_issue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/doctype/customer_issue/customer_issue.js b/support/doctype/customer_issue/customer_issue.js index 5b670d452c..d161a78a78 100644 --- a/support/doctype/customer_issue/customer_issue.js +++ b/support/doctype/customer_issue/customer_issue.js @@ -6,7 +6,7 @@ wn.provide("erpnext.support"); erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({ refresh: function() { if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) { - cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit) + cur_frm.add_custom_button(wn._('Make Maintenance Visit'), this.make_maintenance_visit) } }, From 1fcc3d9748fdcbaa31c158c01bd93c889d57ed84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:32:05 -0300 Subject: [PATCH 071/135] Fix translate maintenance_schedule.js --- support/doctype/maintenance_schedule/maintenance_schedule.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/support/doctype/maintenance_schedule/maintenance_schedule.js index 6b693435ab..bdcdd3d935 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/support/doctype/maintenance_schedule/maintenance_schedule.js @@ -91,7 +91,7 @@ cur_frm.cscript.periodicity = function(doc, cdt, cdn){ return get_server_fields('get_no_of_visits',docstring(arg),'item_maintenance_detail',doc, cdt, cdn, 1); } else{ - msgprint("Please enter Start Date and End Date"); + msgprint(wn._("Please enter Start Date and End Date")); } } @@ -103,7 +103,7 @@ cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) { } ); } else { - alert("Please save the document before generating maintenance schedule"); + alert(wn._("Please save the document before generating maintenance schedule")); } } From cd855901225045659c939bd0609d600ffd0162d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:37:27 -0300 Subject: [PATCH 072/135] Fix translate newsletter.js --- support/doctype/newsletter/newsletter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/doctype/newsletter/newsletter.js b/support/doctype/newsletter/newsletter.js index 05311963cb..b532b299bb 100644 --- a/support/doctype/newsletter/newsletter.js +++ b/support/doctype/newsletter/newsletter.js @@ -16,7 +16,7 @@ cur_frm.cscript.refresh = function(doc) { erpnext.hide_naming_series(); if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved && inList(wn.boot.profile.can_write, doc.doctype)) { - cur_frm.add_custom_button('Send', function() { + cur_frm.add_custom_button(wn._('Send'), function() { return $c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) { cur_frm.refresh(); }); From f889c4e59c906d0b0c7192d041c42c9e6e36941b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:44:04 -0300 Subject: [PATCH 073/135] Fix translate support_ticket.js --- support/doctype/support_ticket/support_ticket.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 0e61273439..8e34a89c54 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -23,8 +23,8 @@ $.extend(cur_frm.cscript, new erpnext.support.CustomerIssue({frm: cur_frm})); $.extend(cur_frm.cscript, { onload: function(doc, dt, dn) { if(in_list(user_roles,'System Manager')) { - cur_frm.footer.help_area.innerHTML = '

    Email Settings
    \ - Integrate incoming support emails to Support Ticket

    '; + cur_frm.footer.help_area.innerHTML = '

    '+wn._("Email Settings")+'
    \ + '+wn._("Integrate incoming support emails to Support Ticket")+'

    '; } }, From 19165f8f86be868c05ea50ad333e32760711e9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 15:51:17 -0300 Subject: [PATCH 074/135] Fix translate support_analytics.js --- .../support_analytics/support_analytics.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/support/page/support_analytics/support_analytics.js b/support/page/support_analytics/support_analytics.js index 7e449178a6..ecc0749624 100644 --- a/support/page/support_analytics/support_analytics.js +++ b/support/page/support_analytics/support_analytics.js @@ -4,7 +4,7 @@ wn.pages['support-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Support Analytics', + title: wn._('Support Analytics'), single_column: true }); @@ -18,7 +18,7 @@ wn.pages['support-analytics'].onload = function(wrapper) { erpnext.SupportAnalytics = wn.views.GridReportWithPlot.extend({ init: function(wrapper) { this._super({ - title: "Support Analtyics", + title: wn._("Support Analtyics"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -27,22 +27,22 @@ erpnext.SupportAnalytics = wn.views.GridReportWithPlot.extend({ }, filters: [ - {fieldtype:"Select", label: "Fiscal Year", link:"Fiscal Year", + {fieldtype:"Select", label: wn._("Fiscal Year"), link:"Fiscal Year", default_value: "Select Fiscal Year..."}, - {fieldtype:"Date", label: "From Date"}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Select", label: "Range", + {fieldtype:"Date", label: wn._("From Date")}, + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_columns: function() { var std_columns = [ - {id: "check", name: "Plot", field: "check", width: 30, + {id: "check", name: wn._("Plot"), field: "check", width: 30, formatter: this.check_formatter}, - {id: "status", name: "Status", field: "status", width: 100}, + {id: "status", name: wn._("Status"), field: "status", width: 100}, ]; this.make_date_range_columns(); this.columns = std_columns.concat(this.columns); From fdb1fd361dd74bee28d81f62b36a4558cf644eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 17:23:24 -0300 Subject: [PATCH 075/135] Fix translate company.js --- setup/doctype/company/company.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup/doctype/company/company.js b/setup/doctype/company/company.js index ca3c93b49b..2f1d6624f4 100644 --- a/setup/doctype/company/company.js +++ b/setup/doctype/company/company.js @@ -22,7 +22,8 @@ cur_frm.cscript.has_special_chars = function(t) { cur_frm.cscript.company_name = function(doc){ if(doc.company_name && cur_frm.cscript.has_special_chars(doc.company_name)){ - msgprint("Special Characters ! @ # $ % ^ * + = - [ ] ' ; , / { } | : < > ? are not allowed for\nCompany Name " + doc.company_name +"") + msgprint((""+wn._("Special Characters")+" ! @ # $ % ^ * + = - [ ] ' ; , / { } | : < > ? "+ + wn._("are not allowed for ")+"\n"+wn._("Company Name")+" "+ doc.company_name +"")) doc.company_name = ''; refresh_field('company_name'); } @@ -30,7 +31,8 @@ cur_frm.cscript.company_name = function(doc){ cur_frm.cscript.abbr = function(doc){ if(doc.abbr && cur_frm.cscript.has_special_chars(doc.abbr)){ - msgprint("Special Characters ! @ # $ % ^ * + = - [ ] ' ; , / { } | : < > ? are not allowed for\nAbbr " + doc.abbr +"") + msgprint(""wn._("Special Characters ")+"! @ # $ % ^ * + = - [ ] ' ; , / { } | : < > ?" + + wn._("are not allowed for")+ "\nAbbr " + doc.abbr +"") doc.abbr = ''; refresh_field('abbr'); } From 6e2fc5c67617fa1987b59756aca91c1efeb98a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 17:31:15 -0300 Subject: [PATCH 076/135] Fix translate customer_group.js --- setup/doctype/customer_group/customer_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/customer_group/customer_group.js b/setup/doctype/customer_group/customer_group.js index 2953de542d..9541cf8e10 100644 --- a/setup/doctype/customer_group/customer_group.js +++ b/setup/doctype/customer_group/customer_group.js @@ -9,7 +9,7 @@ cur_frm.cscript.set_root_readonly = function(doc) { // read-only for root customer group if(!doc.parent_customer_group) { cur_frm.perm = [[1,0,0], [1,0,0]]; - cur_frm.set_intro("This is a root customer group and cannot be edited."); + cur_frm.set_intro(wn._("This is a root customer group and cannot be edited.")); } else { cur_frm.set_intro(null); } From bd16f133ced2d49708bf501160090eb6fd478850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 17:34:45 -0300 Subject: [PATCH 077/135] Fix translate email_digest.js --- setup/doctype/email_digest/email_digest.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/doctype/email_digest/email_digest.js b/setup/doctype/email_digest/email_digest.js index 552109231f..d009080e98 100644 --- a/setup/doctype/email_digest/email_digest.js +++ b/setup/doctype/email_digest/email_digest.js @@ -3,10 +3,10 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { doc = locals[dt][dn]; - var save_msg = "You must Save the form before proceeding"; - var err_msg = "There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists." + var save_msg = wn._("You must ")+ ""+wn._("Save ")+""+wn._("the form before proceeding"); + var err_msg = wn._("There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.") - cur_frm.add_custom_button('View Now', function() { + cur_frm.add_custom_button(wn._('View Now'), function() { doc = locals[dt][dn]; if(doc.__unsaved != 1) { return $c_obj(make_doclist(dt, dn), 'get_digest_msg', '', function(r, rt) { @@ -16,7 +16,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { } else { //console.log(arguments); var d = new wn.ui.Dialog({ - title: 'Email Digest: ' + dn, + title: wn._('Email Digest: ') + dn, width: 800 }); @@ -29,7 +29,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { msgprint(save_msg); } }, 1); - cur_frm.add_custom_button('Send Now', function() { + cur_frm.add_custom_button(wn._('Send Now'), function() { doc = locals[dt][dn]; if(doc.__unsaved != 1) { return $c_obj(make_doclist(dt, dn), 'send', '', function(r, rt) { @@ -38,7 +38,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { console.log(r.exc); } else { //console.log(arguments); - msgprint('Message Sent'); + msgprint(wn._('Message Sent')); } }); } else { @@ -56,7 +56,7 @@ cur_frm.cscript.addremove_recipients = function(doc, dt, dn) { // Open a dialog and display checkboxes against email addresses doc = locals[dt][dn]; var d = new wn.ui.Dialog({ - title: 'Add/Remove Recipients', + title: wn._('Add/Remove Recipients'), width: 400 }); var dialog_div = $a(d.body, 'div', 'dialog-div', '', ''); From cc58f86842244f2c3dbdaa40570a00f7aa956238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 17:37:30 -0300 Subject: [PATCH 078/135] Fix translate item_group.js --- setup/doctype/item_group/item_group.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/doctype/item_group/item_group.js b/setup/doctype/item_group/item_group.js index 31edef27de..c5a08d4dae 100644 --- a/setup/doctype/item_group/item_group.js +++ b/setup/doctype/item_group/item_group.js @@ -4,7 +4,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc); - cur_frm.add_custom_button("Item Group Tree", function() { + cur_frm.add_custom_button(wn._("Item Group Tree"), function() { wn.set_route("Sales Browser", "Item Group"); }) } @@ -13,7 +13,7 @@ cur_frm.cscript.set_root_readonly = function(doc) { // read-only for root item group if(!doc.parent_item_group) { cur_frm.perm = [[1,0,0], [1,0,0]]; - cur_frm.set_intro("This is a root item group and cannot be edited."); + cur_frm.set_intro(wn._("This is a root item group and cannot be edited.")); } else { cur_frm.set_intro(null); } From 5cf2c004724038c61dd4f87041b71ed1ab0919a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 17:40:44 -0300 Subject: [PATCH 079/135] Fix translate sales_partner.js --- setup/doctype/sales_partner/sales_partner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/doctype/sales_partner/sales_partner.js b/setup/doctype/sales_partner/sales_partner.js index 86b7712142..351aa3d0f6 100644 --- a/setup/doctype/sales_partner/sales_partner.js +++ b/setup/doctype/sales_partner/sales_partner.js @@ -39,7 +39,7 @@ cur_frm.cscript.make_address = function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, as_dict: 1, - no_results_message: 'No addresses created', + no_results_message: wn._('No addresses created'), render_row: function(wrapper, data) { $(wrapper).css('padding','5px 0px'); var link = $ln(wrapper,cstr(data.name), function() { loaddoc("Address", this.dn); }, {fontWeight:'bold'}); @@ -69,7 +69,7 @@ cur_frm.cscript.make_contact = function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, as_dict: 1, - no_results_message: 'No contacts created', + no_results_message: wn._('No contacts created'), render_row: function(wrapper, data) { $(wrapper).css('padding', '5px 0px'); var link = $ln(wrapper, cstr(data.name), function() { loaddoc("Contact", this.dn); }, {fontWeight:'bold'}); From cd0a40b20f327513a557658b2b6498d51d86b91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 4 Oct 2013 17:41:33 -0300 Subject: [PATCH 080/135] Fix translate sales_person.js --- setup/doctype/sales_person/sales_person.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/sales_person/sales_person.js b/setup/doctype/sales_person/sales_person.js index 34f267e825..ec21ead6be 100644 --- a/setup/doctype/sales_person/sales_person.js +++ b/setup/doctype/sales_person/sales_person.js @@ -9,7 +9,7 @@ cur_frm.cscript.set_root_readonly = function(doc) { // read-only for root if(!doc.parent_sales_person) { cur_frm.perm = [[1,0,0], [1,0,0]]; - cur_frm.set_intro("This is a root sales person and cannot be edited."); + cur_frm.set_intro(wn._("This is a root sales person and cannot be edited.")); } else { cur_frm.set_intro(null); } From f6a6399763dd3a9892783ced2a8b29ddbdf54a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 14:06:23 -0300 Subject: [PATCH 081/135] Fix translate home/page/activity/activity.js --- home/page/activity/activity.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js index 8d451939cc..edfe50f363 100644 --- a/home/page/activity/activity.js +++ b/home/page/activity/activity.js @@ -4,7 +4,7 @@ wn.pages['activity'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: "Activity", + title: wn._("Activity"), single_column: true }) wrapper.appframe.add_module_icon("Activity"); @@ -21,7 +21,7 @@ wn.pages['activity'].onload = function(wrapper) { // Build Report Button if(wn.boot.profile.can_get_report.indexOf("Feed")!=-1) { - wrapper.appframe.add_button('Build Report', function() { + wrapper.appframe.add_button(wn._('Build Report'), function() { wn.set_route('Report', "Feed"); }, 'icon-th') } From ab5fe0756a3c2a598cfa82a2c6227ce65137f1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 14:24:49 -0300 Subject: [PATCH 082/135] Fix translate latest_updates.js --- home/page/latest_updates/latest_updates.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 094eeb558e..d5e361eb76 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -4,7 +4,7 @@ wn.pages['latest-updates'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Latest Updates', + title: wn._('Latest Updates'), single_column: true }); @@ -16,9 +16,9 @@ wn.pages['latest-updates'].onload = function(wrapper) { method:"home.page.latest_updates.latest_updates.get", callback: function(r) { parent.empty(); - $("

    Report issues at\ - GitHub Issues

    \ -

    Commit Log

    ") + $("

    "+wn._("Report issues at")+ + ""+wn._("GitHub Issues")+"

    \ +

    "+wn._("Commit Log")+"

    ") .appendTo(parent); var $tbody = $('
    ') From c5f211332569800604ad68255504e3df2710553d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 15:13:29 -0300 Subject: [PATCH 083/135] Fix translate appraisal.js --- hr/doctype/appraisal/appraisal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/doctype/appraisal/appraisal.js b/hr/doctype/appraisal/appraisal.js index f94a288fd5..8c5df8e297 100644 --- a/hr/doctype/appraisal/appraisal.js +++ b/hr/doctype/appraisal/appraisal.js @@ -45,7 +45,7 @@ cur_frm.cscript.score = function(doc,cdt,cdn){ var d = locals[cdt][cdn]; if (d.score){ if (flt(d.score) > 5) { - msgprint("Score must be less than or equal to 5"); + msgprint(wn._("Score must be less than or equal to 5")); d.score = 0; refresh_field('score', d.name, 'appraisal_details'); } From 63439ef7c7da9e39a1d5ef9479cda0b719bcd827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 15:33:56 -0300 Subject: [PATCH 084/135] fix translate hr/doctype/employee/employee.js --- hr/doctype/employee/employee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/doctype/employee/employee.js b/hr/doctype/employee/employee.js index 01200e7d22..cfedfc6111 100644 --- a/hr/doctype/employee/employee.js +++ b/hr/doctype/employee/employee.js @@ -21,7 +21,7 @@ erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({ var me = this; erpnext.hide_naming_series(); if(!this.frm.doc.__islocal) { - cur_frm.add_custom_button('Make Salary Structure', function() { + cur_frm.add_custom_button(wn._('Make Salary Structure'), function() { me.make_salary_structure(this); }); } }, From 28181d338499d1a264884a4af9ba8b1120171ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 15:39:20 -0300 Subject: [PATCH 085/135] Fix translate expense_claim.js --- hr/doctype/expense_claim/expense_claim.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js index f7895b10eb..e19cac7751 100644 --- a/hr/doctype/expense_claim/expense_claim.js +++ b/hr/doctype/expense_claim/expense_claim.js @@ -93,28 +93,28 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){ cur_frm.savesubmit(); if(doc.docstatus==1 && wn.model.can_create("Journal Voucher")) - cur_frm.add_custom_button("Make Bank Voucher", cur_frm.cscript.make_bank_voucher); + cur_frm.add_custom_button(wn._("Make Bank Voucher"), cur_frm.cscript.make_bank_voucher); } } cur_frm.cscript.set_help = function(doc) { cur_frm.set_intro(""); if(doc.__islocal && !in_list(user_roles, "HR User")) { - cur_frm.set_intro("Fill the form and save it") + cur_frm.set_intro(wn._("Fill the form and save it")) } else { if(doc.docstatus==0 && doc.approval_status=="Draft") { if(user==doc.exp_approver) { - cur_frm.set_intro("You are the Expense Approver for this record. \ - Please Update the 'Status' and Save"); + cur_frm.set_intro(wn._("You are the Expense Approver for this record. \ + Please Update the 'Status' and Save")); } else { - cur_frm.set_intro("Expense Claim is pending approval. \ - Only the Expense Approver can update status."); + cur_frm.set_intro(wn._("Expense Claim is pending approval. \ + Only the Expense Approver can update status.")); } } else { if(doc.approval_status=="Approved") { - cur_frm.set_intro("Expense Claim has been approved."); + cur_frm.set_intro(wn._("Expense Claim has been approved.")); } else if(doc.approval_status=="Rejected") { - cur_frm.set_intro("Expense Claim has been rejected."); + cur_frm.set_intro(wn._("Expense Claim has been rejected.")); } } } From f70e3aabcb3b6b10a191aa101886a69b736c7661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:22:21 -0300 Subject: [PATCH 086/135] Fix translate hr/doctype/leave_application/leave_application.js --- hr/doctype/leave_application/leave_application.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js index 5969f4dc4f..7b32cff691 100755 --- a/hr/doctype/leave_application/leave_application.js +++ b/hr/doctype/leave_application/leave_application.js @@ -31,14 +31,14 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { } cur_frm.set_intro(""); if(doc.__islocal && !in_list(user_roles, "HR User")) { - cur_frm.set_intro("Fill the form and save it") + cur_frm.set_intro(wn._("Fill the form and save it")) } else { if(doc.docstatus==0 && doc.status=="Open") { if(user==doc.leave_approver) { - cur_frm.set_intro("You are the Leave Approver for this record. Please Update the 'Status' and Save"); + cur_frm.set_intro(wn._("You are the Leave Approver for this record. Please Update the 'Status' and Save")); cur_frm.toggle_enable("status", true); } else { - cur_frm.set_intro("This Leave Application is pending approval. Only the Leave Apporver can update status.") + cur_frm.set_intro(wn._("This Leave Application is pending approval. Only the Leave Apporver can update status.")) cur_frm.toggle_enable("status", false); if(!doc.__islocal) { if(cur_frm.frm_head.appframe.buttons.Submit) @@ -47,12 +47,12 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { } } else { if(doc.status=="Approved") { - cur_frm.set_intro("Leave application has been approved."); + cur_frm.set_intro(wn._("Leave application has been approved.")); if(cur_frm.doc.docstatus==0) { - cur_frm.set_intro("Please submit to update Leave Balance."); + cur_frm.set_intro(wn._("Please submit to update Leave Balance.")); } } else if(doc.status=="Rejected") { - cur_frm.set_intro("Leave application has been rejected."); + cur_frm.set_intro(wn._("Leave application has been rejected.")); } } } @@ -86,7 +86,7 @@ cur_frm.cscript.from_date = function(doc, dt, dn) { cur_frm.cscript.to_date = function(doc, dt, dn) { if(cint(doc.half_day) == 1 && cstr(doc.from_date) && doc.from_date != doc.to_date){ - msgprint("To Date should be same as From Date for Half Day leave"); + msgprint(wn._("To Date should be same as From Date for Half Day leave")); set_multiple(dt,dn,{to_date:doc.from_date}); } cur_frm.cscript.calculate_total_days(doc, dt, dn); From 2521910d56887a2edbfa79b1639a8180bb823b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:24:17 -0300 Subject: [PATCH 087/135] Fix translate leave_control_panel.js --- hr/doctype/leave_control_panel/leave_control_panel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/doctype/leave_control_panel/leave_control_panel.js b/hr/doctype/leave_control_panel/leave_control_panel.js index a53f031f4c..7a840ba78d 100644 --- a/hr/doctype/leave_control_panel/leave_control_panel.js +++ b/hr/doctype/leave_control_panel/leave_control_panel.js @@ -15,7 +15,7 @@ cur_frm.cscript.to_date = function(doc, cdt, cdn) { function(r, rt) { var doc = locals[cdt][cdn]; if (r.message) { - alert("To date cannot be before from date"); + alert(wn._("To date cannot be before from date")); doc.to_date = ''; refresh_field('to_date'); } From e9548a55e99c619146f7b1028d071c2cdae62ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:27:46 -0300 Subject: [PATCH 088/135] Fix translate salary_manager.js --- hr/doctype/salary_manager/salary_manager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hr/doctype/salary_manager/salary_manager.js b/hr/doctype/salary_manager/salary_manager.js index 178ab3ef6b..b27d41c418 100644 --- a/hr/doctype/salary_manager/salary_manager.js +++ b/hr/doctype/salary_manager/salary_manager.js @@ -5,7 +5,7 @@ var display_activity_log = function(msg) { if(!pscript.ss_html) pscript.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div'); pscript.ss_html.innerHTML = - '
    Activity Log:
    '+msg+'
    '; + '
    '+wn._("Activity Log:")+'
    '+msg+'
    '; } //Create salary slip @@ -23,7 +23,7 @@ cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) { //Submit salary slip //----------------------- cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) { - var check = confirm("Do you really want to Submit all Salary Slip for month : " + doc.month+" and fiscal year : "+doc.fiscal_year); + var check = confirm(wn._("Do you really want to Submit all Salary Slip for month : ") + doc.month+ wn._(" and fiscal year : ")+doc.fiscal_year); if(check){ var callback = function(r, rt){ if (r.message) @@ -49,7 +49,7 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) { var jv = wn.model.make_new_doc_and_get_name('Journal Voucher'); jv = locals['Journal Voucher'][jv]; jv.voucher_type = 'Bank Voucher'; - jv.user_remark = 'Payment of salary for the month: ' + doc.month + 'and fiscal year: ' + doc.fiscal_year; + jv.user_remark = wn._('Payment of salary for the month: ') + doc.month + wn._('and fiscal year: ') + doc.fiscal_year; jv.fiscal_year = doc.fiscal_year; jv.company = doc.company; jv.posting_date = dateutil.obj_to_str(new Date()); From 5fa2fca9bda76f814101ba38a2c89d8c56abf322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:31:36 -0300 Subject: [PATCH 089/135] fix translate salary_structure.js --- hr/doctype/salary_structure/salary_structure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/doctype/salary_structure/salary_structure.js b/hr/doctype/salary_structure/salary_structure.js index 81cb63d352..15b3512935 100644 --- a/hr/doctype/salary_structure/salary_structure.js +++ b/hr/doctype/salary_structure/salary_structure.js @@ -12,7 +12,7 @@ cur_frm.cscript.onload = function(doc, dt, dn){ cur_frm.cscript.refresh = function(doc, dt, dn){ if((!doc.__islocal) && (doc.is_active == 'Yes')){ - cur_frm.add_custom_button('Make Salary Slip', cur_frm.cscript['Make Salary Slip']); + cur_frm.add_custom_button(wn._('Make Salary Slip'), cur_frm.cscript['Make Salary Slip']); } cur_frm.toggle_enable('employee', doc.__islocal); From 6287e8e906a9fc62b050e6c0c9aa4f73d0bdf7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:34:30 -0300 Subject: [PATCH 090/135] Fix translate upload_attendance.js --- hr/doctype/upload_attendance/upload_attendance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hr/doctype/upload_attendance/upload_attendance.js b/hr/doctype/upload_attendance/upload_attendance.js index 71e266928d..bf584a00fc 100644 --- a/hr/doctype/upload_attendance/upload_attendance.js +++ b/hr/doctype/upload_attendance/upload_attendance.js @@ -17,7 +17,7 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({ get_template:function() { if(!this.frm.doc.att_fr_date || !this.frm.doc.att_to_date) { - msgprint("Attendance From Date and Attendance To Date is mandatory"); + msgprint(wn._("Attendance From Date and Attendance To Date is mandatory")); return; } window.location.href = repl(wn.request.url + @@ -56,10 +56,10 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({ return v; }); - r.messages = ["

    Import Failed!

    "] + r.messages = ["

    "+wn._("Import Failed!"+"

    "] .concat(r.messages) } else { - r.messages = ["

    Import Successful!

    "]. + r.messages = ["

    "+wn._("Import Successful!"+"

    "]. concat(r.message.messages) } From d851a0426186890fbd974988fa2c218926b2af43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:36:29 -0300 Subject: [PATCH 091/135] Fix translate employee_birthday.js --- hr/report/employee_birthday/employee_birthday.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/report/employee_birthday/employee_birthday.js b/hr/report/employee_birthday/employee_birthday.js index 3fd849266f..8fce812abf 100644 --- a/hr/report/employee_birthday/employee_birthday.js +++ b/hr/report/employee_birthday/employee_birthday.js @@ -5,7 +5,7 @@ wn.query_reports["Employee Birthday"] = { "filters": [ { "fieldname":"month", - "label": "Month", + "label": wn._("Month"), "fieldtype": "Select", "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec", "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", @@ -13,7 +13,7 @@ wn.query_reports["Employee Birthday"] = { }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_user_default("company") From 54e8fbc070378c7b86929ab4b9cfb6d63d99f6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:37:21 -0300 Subject: [PATCH 092/135] Fix translate employee_leave_balance.js --- hr/report/employee_leave_balance/employee_leave_balance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/report/employee_leave_balance/employee_leave_balance.js b/hr/report/employee_leave_balance/employee_leave_balance.js index 1bf252d2a7..7af65b641f 100644 --- a/hr/report/employee_leave_balance/employee_leave_balance.js +++ b/hr/report/employee_leave_balance/employee_leave_balance.js @@ -5,14 +5,14 @@ wn.query_reports["Employee Leave Balance"] = { "filters": [ { "fieldname":"fiscal_year", - "label": "Fiscal Year", + "label": wn._("Fiscal Year"), "fieldtype": "Link", "options": "Fiscal Year", "default": wn.defaults.get_user_default("fiscal_year") }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_user_default("company") From 3b956d98b8c8c21c9bf2689e5f5096c0faeffc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:38:35 -0300 Subject: [PATCH 093/135] Fix translate monthly_attendance_sheet.js --- .../monthly_attendance_sheet/monthly_attendance_sheet.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js index 678e7af713..fc14b6dd8e 100644 --- a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js +++ b/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js @@ -5,7 +5,7 @@ wn.query_reports["Monthly Attendance Sheet"] = { "filters": [ { "fieldname":"month", - "label": "Month", + "label": wn._("Month"), "fieldtype": "Select", "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec", "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", @@ -13,20 +13,20 @@ wn.query_reports["Monthly Attendance Sheet"] = { }, { "fieldname":"fiscal_year", - "label": "Fiscal Year", + "label": wn._("Fiscal Year"), "fieldtype": "Link", "options": "Fiscal Year", "default": sys_defaults.fiscal_year, }, { "fieldname":"employee", - "label": "Employee", + "label": wn._("Employee"), "fieldtype": "Link", "options": "Employee" }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From a82d51b5667200c5d01da09629685cca4eb4d144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 16:39:41 -0300 Subject: [PATCH 094/135] Fix translate monthly_salary_register.js --- .../monthly_salary_register/monthly_salary_register.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr/report/monthly_salary_register/monthly_salary_register.js b/hr/report/monthly_salary_register/monthly_salary_register.js index eb33d08cd0..45d7ff9bad 100644 --- a/hr/report/monthly_salary_register/monthly_salary_register.js +++ b/hr/report/monthly_salary_register/monthly_salary_register.js @@ -5,7 +5,7 @@ wn.query_reports["Monthly Salary Register"] = { "filters": [ { "fieldname":"month", - "label": "Month", + "label": wn._("Month"), "fieldtype": "Select", "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec", "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", @@ -13,20 +13,20 @@ wn.query_reports["Monthly Salary Register"] = { }, { "fieldname":"fiscal_year", - "label": "Fiscal Year", + "label": wn._("Fiscal Year"), "fieldtype": "Link", "options": "Fiscal Year", "default": sys_defaults.fiscal_year, }, { "fieldname":"employee", - "label": "Employee", + "label": wn._("Employee"), "fieldtype": "Link", "options": "Employee" }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From 4de55b4f6efd8ab6b29f5dc8e0b497c31a2da6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 17:10:04 -0300 Subject: [PATCH 095/135] Fix translate account_tree_grid.js --- public/js/account_tree_grid.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/public/js/account_tree_grid.js b/public/js/account_tree_grid.js index c779cfa6d9..28db1d7946 100644 --- a/public/js/account_tree_grid.js +++ b/public/js/account_tree_grid.js @@ -36,39 +36,39 @@ erpnext.AccountTreeGrid = wn.views.TreeGridReport.extend({ }, setup_columns: function() { this.columns = [ - {id: "name", name: "Account", field: "name", width: 300, cssClass: "cell-title", + {id: "name", name: wn._("Account"), field: "name", width: 300, cssClass: "cell-title", formatter: this.tree_formatter}, - {id: "opening_debit", name: "Opening (Dr)", field: "opening_debit", width: 100, + {id: "opening_debit", name: wn._("Opening (Dr)"), field: "opening_debit", width: 100, formatter: this.currency_formatter}, - {id: "opening_credit", name: "Opening (Cr)", field: "opening_credit", width: 100, + {id: "opening_credit", name: wn._("Opening (Cr)"), field: "opening_credit", width: 100, formatter: this.currency_formatter}, - {id: "debit", name: "Debit", field: "debit", width: 100, + {id: "debit", name: wn._("Debit"), field: "debit", width: 100, formatter: this.currency_formatter}, - {id: "credit", name: "Credit", field: "credit", width: 100, + {id: "credit", name: wn._("Credit"), field: "credit", width: 100, formatter: this.currency_formatter}, - {id: "closing_debit", name: "Closing (Dr)", field: "closing_debit", width: 100, + {id: "closing_debit", name: wn._("Closing (Dr)"), field: "closing_debit", width: 100, formatter: this.currency_formatter}, - {id: "closing_credit", name: "Closing (Cr)", field: "closing_credit", width: 100, + {id: "closing_credit", name: wn._("Closing (Cr)"), field: "closing_credit", width: 100, formatter: this.currency_formatter} ]; }, filters: [ - {fieldtype: "Select", label: "Company", link:"Company", default_value: "Select Company...", + {fieldtype: "Select", label: wn._("Company"), link:"Company", default_value: "Select Company...", filter: function(val, item, opts, me) { if (item.company == val || val == opts.default_value) { return me.apply_zero_filter(val, item, opts, me); } return false; }}, - {fieldtype: "Select", label: "Fiscal Year", link:"Fiscal Year", + {fieldtype: "Select", label: wn._("Fiscal Year"), link:"Fiscal Year", default_value: "Select Fiscal Year..."}, - {fieldtype: "Date", label: "From Date"}, - {fieldtype: "Label", label: "To"}, - {fieldtype: "Date", label: "To Date"}, - {fieldtype: "Button", label: "Refresh", icon:"icon-refresh icon-white", + {fieldtype: "Date", label: wn._("From Date")}, + {fieldtype: "Label", label: wn._("To")}, + {fieldtype: "Date", label: wn._("To Date")}, + {fieldtype: "Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype: "Button", label: "Reset Filters"}, + {fieldtype: "Button", label: wn._("Reset Filters")}, ], setup_filters: function() { this._super(); @@ -193,7 +193,7 @@ erpnext.AccountTreeGrid = wn.views.TreeGridReport.extend({ set_fiscal_year: function() { if (this.opening_date > this.closing_date) { - msgprint("Opening Date should be before Closing Date"); + msgprint(wn._("Opening Date should be before Closing Date")); return; } @@ -207,7 +207,7 @@ erpnext.AccountTreeGrid = wn.views.TreeGridReport.extend({ }); if (!this.fiscal_year) { - msgprint("Opening Date and Closing Date should be within same Fiscal Year"); + msgprint(wn._("Opening Date and Closing Date should be within same Fiscal Year")); return; } }, From f48ae145944387bf2f22d53489e9bcc6114dae74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 17:27:37 -0300 Subject: [PATCH 096/135] Fix translate complete_setup.js --- public/js/complete_setup.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/public/js/complete_setup.js b/public/js/complete_setup.js index e565621a2a..eeb39d60d5 100644 --- a/public/js/complete_setup.js +++ b/public/js/complete_setup.js @@ -15,24 +15,24 @@ $.extend(erpnext.complete_setup, { var d = new wn.ui.Dialog({ title: "Setup", fields: [ - {fieldname:'first_name', label:'Your First Name', fieldtype:'Data', reqd: 1}, - {fieldname:'last_name', label:'Your Last Name', fieldtype:'Data'}, - {fieldname:'company_name', label:'Company Name', fieldtype:'Data', reqd:1, - description: 'e.g. "My Company LLC"'}, - {fieldname:'company_abbr', label:'Company Abbreviation', fieldtype:'Data', - description:'e.g. "MC"',reqd:1}, - {fieldname:'fy_start', label:'Financial Year Start Date', fieldtype:'Select', - description:'Your financial year begins on"', reqd:1, + {fieldname:'first_name', label:wn._('Your First Name'), fieldtype:'Data', reqd: 1}, + {fieldname:'last_name', label: wn._('Your Last Name'), fieldtype:'Data'}, + {fieldname:'company_name', label:wn._('Company Name'), fieldtype:'Data', reqd:1, + description: wn._('e.g. "My Company LLC"')}, + {fieldname:'company_abbr', label:wn._('Company Abbreviation'), fieldtype:'Data', + description:wn._('e.g. "MC"'),reqd:1}, + {fieldname:'fy_start', label:wn._('Financial Year Start Date'), fieldtype:'Select', + description:wn._('Your financial year begins on"'), reqd:1, options: erpnext.complete_setup.fy_start_list.join('\n')}, - {fieldname:'country', label: 'Country', reqd:1, + {fieldname:'country', label: wn._('Country'), reqd:1, options: "", fieldtype: 'Select'}, - {fieldname:'currency', label: 'Default Currency', reqd:1, + {fieldname:'currency', label: wn._('Default Currency'), reqd:1, options: "", fieldtype: 'Select'}, - {fieldname:'timezone', label: 'Time Zone', reqd:1, + {fieldname:'timezone', label: wn._('Time Zone'), reqd:1, options: "", fieldtype: 'Select'}, - {fieldname:'industry', label: 'Industry', reqd:1, + {fieldname:'industry', label: wn._('Industry'), reqd:1, options: erpnext.complete_setup.domains.join('\n'), fieldtype: 'Select'}, - {fieldname:'update', label:'Setup',fieldtype:'Button'}, + {fieldname:'update', label:wn._('Setup'),fieldtype:'Button'}, ], }); From 97408254a2243586ba3feb90eab80b2a7eb91a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 17:29:58 -0300 Subject: [PATCH 097/135] Fix translate conf.js --- public/js/conf.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/conf.js b/public/js/conf.js index 993d2ab800..bc49f711a8 100644 --- a/public/js/conf.js +++ b/public/js/conf.js @@ -24,14 +24,14 @@ $(document).bind('toolbar_setup', function() { wn.provide('wn.ui.misc'); wn.ui.misc.about = function() { if(!wn.ui.misc.about_dialog) { - var d = new wn.ui.Dialog({title:'About ERPNext'}) + var d = new wn.ui.Dialog({title: wn._('About ERPNext')}) $(d.body).html(repl("
    \ -

    ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd.\ +

    "+wn._("ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd.\ to provide an integrated tool to manage most processes in a small organization.\ - For more information about Web Notes, or to buy hosting servies, go to \ - https://erpnext.com.

    \ -

    To report an issue, go to GitHub Issues

    \ + For more information about Web Notes, or to buy hosting servies, go to ")+ + "https://erpnext.com.

    \ +

    "+wn._("To report an issue, go to ")+"GitHub Issues

    \
    \

    License: GNU General Public License Version 3

    \
    ", wn.app)); From f99085055df48dee578dd4da712df1cd6d3ca80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 17:32:29 -0300 Subject: [PATCH 098/135] Fix translate feature_setup.js --- public/js/feature_setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 31f81be342..96dea90ead 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -198,7 +198,7 @@ $(document).bind('form_refresh', function() { } else if(cur_frm.fields_dict[fort]) { cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort], false); } else { - msgprint('Grid "'+fort+'" does not exists'); + msgprint(wn._('Grid "')+fort+wn._('" does not exists')); } } } From 339129b21be69633f18ac778eac27f6990d3a9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 17:54:05 -0300 Subject: [PATCH 099/135] Fix translate feature_setup.js --- public/js/feature_setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 96dea90ead..0abb495994 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -198,7 +198,7 @@ $(document).bind('form_refresh', function() { } else if(cur_frm.fields_dict[fort]) { cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort], false); } else { - msgprint(wn._('Grid "')+fort+wn._('" does not exists')); + msgprint(wn._('Grid "')+fort+wn._('"does not exists')); } } } From 79c43988b43eadd224b51163d44289f657169618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 7 Oct 2013 18:56:56 -0300 Subject: [PATCH 100/135] Fix translate feature_setup.js --- public/js/feature_setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 0abb495994..96dea90ead 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -198,7 +198,7 @@ $(document).bind('form_refresh', function() { } else if(cur_frm.fields_dict[fort]) { cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort], false); } else { - msgprint(wn._('Grid "')+fort+wn._('"does not exists')); + msgprint(wn._('Grid "')+fort+wn._('" does not exists')); } } } From 2dcfbd16421ecccf5b327c7c6b4e823ab7ed73ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 14:35:14 -0300 Subject: [PATCH 101/135] Fix translate purchase_trends_filters.js --- public/js/purchase_trends_filters.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/purchase_trends_filters.js b/public/js/purchase_trends_filters.js index 5a13066a24..62d7fd2650 100644 --- a/public/js/purchase_trends_filters.js +++ b/public/js/purchase_trends_filters.js @@ -5,35 +5,35 @@ var get_filters = function(){ return [ { "fieldname":"period", - "label": "Period", + "label": wn._("Period"), "fieldtype": "Select", "options": ["Monthly", "Quarterly", "Half-Yearly", "Yearly"].join("\n"), "default": "Monthly" }, { "fieldname":"based_on", - "label": "Based On", + "label": wn._("Based On"), "fieldtype": "Select", "options": ["Item", "Item Group", "Supplier", "Supplier Type", "Project"].join("\n"), "default": "Item" }, { "fieldname":"group_by", - "label": "Group By", + "label": wn._("Group By"), "fieldtype": "Select", "options": ["Item", "Supplier"].join("\n"), "default": "" }, { "fieldname":"fiscal_year", - "label": "Fiscal Year", + "label": wn._("Fiscal Year"), "fieldtype": "Link", "options":'Fiscal Year', "default": sys_defaults.fiscal_year }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From 2368004cb0565c832ebe6d87f8feb2ff3b356071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 14:41:46 -0300 Subject: [PATCH 102/135] Fix translate sales_trends_filters.js --- public/js/sales_trends_filters.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/sales_trends_filters.js b/public/js/sales_trends_filters.js index 63f6e63e5a..29bb779b4a 100644 --- a/public/js/sales_trends_filters.js +++ b/public/js/sales_trends_filters.js @@ -5,35 +5,35 @@ var get_filters = function(){ return[ { "fieldname":"period", - "label": "Period", + "label": wn._("Period"), "fieldtype": "Select", "options": ["Monthly", "Quarterly", "Half-Yearly", "Yearly"].join("\n"), "default": "Monthly" }, { "fieldname":"based_on", - "label": "Based On", + "label": wn._("Based On"), "fieldtype": "Select", "options": ["Item", "Item Group", "Customer", "Customer Group", "Territory", "Project"].join("\n"), "default": "Item" }, { "fieldname":"group_by", - "label": "Group By", + "label": wn._("Group By"), "fieldtype": "Select", "options": ["Item", "Customer"].join("\n"), "default": "" }, { "fieldname":"fiscal_year", - "label": "Fiscal Year", + "label": wn._("Fiscal Year"), "fieldtype": "Link", "options":'Fiscal Year', "default": sys_defaults.fiscal_year }, { "fieldname":"company", - "label": "Company", + "label": wn._("Company"), "fieldtype": "Link", "options": "Company", "default": wn.defaults.get_default("company") From e5b83d7995ebe9ad88573f559b4b57da2f4ceb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 14:48:34 -0300 Subject: [PATCH 103/135] Fix translate startup.js --- public/js/startup.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/startup.js b/public/js/startup.js index eee8a05620..4b58c4cadb 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -6,7 +6,7 @@ var current_module; wn.provide('erpnext.startup'); erpnext.startup.start = function() { - console.log('Starting up...'); + console.log(wn._('Starting up...')); $('#startup_div').html('Starting up...').toggle(true); if(user != 'Guest'){ @@ -35,16 +35,16 @@ erpnext.startup.show_expiry_banner = function() { var today = dateutil.str_to_obj(wn.boot.server_date); var expires_on = dateutil.str_to_obj(wn.boot.expires_on); var diff = dateutil.get_diff(expires_on, today); - var payment_link = "\ - Click here to buy subscription."; + var payment_link = ""+ + wn._("Click here to buy subscription.")+""; var msg = ""; if (0 <= diff && diff <= 10) { var expiry_string = diff==0 ? "today" : repl("in %(diff)s day(s)", { diff: diff }); - msg = repl('Your ERPNext subscription will expire %(expiry_string)s. %(payment_link)s', + msg = repl(wn._('Your ERPNext subscription will expire %(expiry_string)s. %(payment_link)s')), { expiry_string: expiry_string, payment_link: payment_link }); } else if (diff < 0) { - msg = repl('This ERPNext subscription has expired. %(payment_link)s', {payment_link: payment_link}); + msg = repl(wn._('This ERPNext subscription has expired. %(payment_link)s'), {payment_link: payment_link}); } if(msg) wn.ui.toolbar.show_banner(msg); From fa567a11904c910e1a1a04ca0e7fea5558838b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 14:56:03 -0300 Subject: [PATCH 104/135] Fix translate stock_analytics.js --- public/js/stock_analytics.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js index 5b58113046..8cb6161636 100644 --- a/public/js/stock_analytics.js +++ b/public/js/stock_analytics.js @@ -6,7 +6,7 @@ wn.require("app/js/stock_grid_report.js"); erpnext.StockAnalytics = erpnext.StockGridReport.extend({ init: function(wrapper, opts) { var args = { - title: "Stock Analytics", + title: wn._("Stock Analytics"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -36,13 +36,13 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ }, setup_columns: function() { var std_columns = [ - {id: "check", name: "Plot", field: "check", width: 30, + {id: "check", name: wn._("Plot"), field: "check", width: 30, formatter: this.check_formatter}, - {id: "name", name: "Item", field: "name", width: 300, + {id: "name", name: wn._("Item"), field: "name", width: 300, formatter: this.tree_formatter}, - {id: "brand", name: "Brand", field: "brand", width: 100}, - {id: "stock_uom", name: "UOM", field: "stock_uom", width: 100}, - {id: "opening", name: "Opening", field: "opening", hidden: true, + {id: "brand", name: wn._("Brand"), field: "brand", width: 100}, + {id: "stock_uom", name: wn._("UOM"), field: "stock_uom", width: 100}, + {id: "opening", name: wn._("Opening"), field: "opening", hidden: true, formatter: this.currency_formatter} ]; @@ -50,23 +50,23 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ this.columns = std_columns.concat(this.columns); }, filters: [ - {fieldtype:"Select", label: "Value or Qty", options:["Value", "Quantity"], + {fieldtype:"Select", label: wn._("Value or Qty"), options:["Value", "Quantity"], filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }}, - {fieldtype:"Select", label: "Brand", link:"Brand", + {fieldtype:"Select", label: wn._("Brand"), link:"Brand", default_value: "Select Brand...", filter: function(val, item, opts) { return val == opts.default_value || item.brand == val || item._show; }, link_formatter: {filter_input: "brand"}}, - {fieldtype:"Select", label: "Warehouse", link:"Warehouse", + {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse", default_value: "Select Warehouse..."}, - {fieldtype:"Date", label: "From Date"}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Select", label: "Range", + {fieldtype:"Date", label: wn._("From Date")}, + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { var me = this; From 534af0bccaab074eb46317acd7344b02020a44e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:00:07 -0300 Subject: [PATCH 105/135] Fix translate transaction.js --- public/js/transaction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/transaction.js b/public/js/transaction.js index 387140472c..3080ba1721 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -234,7 +234,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ validate_on_previous_row: function(tax) { // validate if a valid row id is mentioned in case of // On Previous Row Amount and On Previous Row Total - if((["On Previous Row Amount", "On Previous Row Total"].indexOf(tax.charge_type) != -1) && + if(([wn._("On Previous Row Amount"), wn._("On Previous Row Total")].indexOf(tax.charge_type) != -1) && (!tax.row_id || cint(tax.row_id) >= tax.idx)) { var msg = repl(wn._("Row") + " # %(idx)s [%(doctype)s]: " + wn._("Please specify a valid") + " %(row_id_label)s", { From 961d2e210434f6b8d4908eb6a6355b6920e2a629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:01:37 -0300 Subject: [PATCH 106/135] Fix translate utils.js --- public/js/utils.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/utils.js b/public/js/utils.js index 61e613bdec..a8df11e933 100644 --- a/public/js/utils.js +++ b/public/js/utils.js @@ -41,19 +41,19 @@ $.extend(erpnext, { if(!grid_row.fields_dict.serial_no || grid_row.fields_dict.serial_no.get_status()!=="Write") return; - var $btn = $('') + var $btn = $('') .appendTo($("
    ") .css({"margin-bottom": "10px", "margin-top": "-10px"}) .appendTo(grid_row.fields_dict.serial_no.$wrapper)); $btn.on("click", function() { var d = new wn.ui.Dialog({ - title: "Add Serial No", + title: wn._("Add Serial No"), fields: [ { "fieldtype": "Link", "options": "Serial No", - "label": "Serial No", + "label": wn._("Serial No"), "get_query": { item_code: grid_row.doc.item_code, warehouse: grid_row.doc.warehouse @@ -61,7 +61,7 @@ $.extend(erpnext, { }, { "fieldtype": "Button", - "label": "Add" + "label": wn._("Add") } ] }); From ac6fc6fab648003d6c050e9cc83f39a6c00059c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:13:25 -0300 Subject: [PATCH 107/135] Fix translate project.js --- projects/doctype/project/project.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js index 74cfa45198..3dfe897383 100644 --- a/projects/doctype/project/project.js +++ b/projects/doctype/project/project.js @@ -4,11 +4,11 @@ // show tasks cur_frm.cscript.refresh = function(doc) { if(!doc.__islocal) { - cur_frm.add_custom_button("Gantt Chart", function() { + cur_frm.add_custom_button(wn._("Gantt Chart"), function() { wn.route_options = {"project": doc.name} wn.set_route("Gantt", "Task"); }, "icon-tasks"); - cur_frm.add_custom_button("Tasks", function() { + cur_frm.add_custom_button(wn._("Tasks"), function() { wn.route_options = {"project": doc.name} wn.set_route("List", "Task"); }, "icon-list"); From f4cde68097867ac3390a762028707f9b3ba33bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:17:44 -0300 Subject: [PATCH 108/135] Fix translate time_log_calendar.js --- projects/doctype/task/task_calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/doctype/task/task_calendar.js b/projects/doctype/task/task_calendar.js index 77728553e0..29d1c9940b 100644 --- a/projects/doctype/task/task_calendar.js +++ b/projects/doctype/task/task_calendar.js @@ -6,7 +6,7 @@ wn.views.calendar["Task"] = { "start": "exp_start_date", "end": "exp_end_date", "id": "name", - "title": "subject", + "title": wn._("subject"), "allDay": "allDay" }, gantt: true, @@ -15,7 +15,7 @@ wn.views.calendar["Task"] = { "fieldtype": "Link", "fieldname": "project", "options": "Project", - "label": "Project" + "label": wn._("Project") } ], get_events_method: "projects.doctype.task.task.get_events" From e52998fd12a43efe8421ad140f83c959b6fcd550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:19:18 -0300 Subject: [PATCH 109/135] Fix translate time_log_calendar.js --- projects/doctype/time_log/time_log_calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/doctype/time_log/time_log_calendar.js b/projects/doctype/time_log/time_log_calendar.js index a4f22db329..12cfcba562 100644 --- a/projects/doctype/time_log/time_log_calendar.js +++ b/projects/doctype/time_log/time_log_calendar.js @@ -6,7 +6,7 @@ wn.views.calendar["Time Log"] = { "start": "from_time", "end": "to_time", "id": "name", - "title": "title", + "title": w._("title"), "allDay": "allDay" }, get_events_method: "projects.doctype.time_log.time_log.get_events" From e9c36599f516df73fb93793a358a00c2852be2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:23:51 -0300 Subject: [PATCH 110/135] Fix translate time_log_batch.js --- projects/doctype/time_log_batch/time_log_batch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/doctype/time_log_batch/time_log_batch.js b/projects/doctype/time_log_batch/time_log_batch.js index 96f7c2229d..c338c401a1 100644 --- a/projects/doctype/time_log_batch/time_log_batch.js +++ b/projects/doctype/time_log_batch/time_log_batch.js @@ -25,7 +25,7 @@ $.extend(cur_frm.cscript, { }[doc.status]); if(doc.status=="Submitted") { - cur_frm.add_custom_button("Make Sales Invoice", function() { cur_frm.cscript.make_invoice() }, + cur_frm.add_custom_button(wn._("Make Sales Invoice"), function() { cur_frm.cscript.make_invoice() }, "icon-file-alt"); } }, From 91d9ddd4f04a575f1b8732251bd444a9c7ef6b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 8 Oct 2013 15:45:58 -0300 Subject: [PATCH 111/135] Fix translate demo-login.js --- utilities/demo/demo-login.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/demo/demo-login.js b/utilities/demo/demo-login.js index 509057b9ef..03fe6b96b9 100644 --- a/utilities/demo/demo-login.js +++ b/utilities/demo/demo-login.js @@ -14,9 +14,9 @@ $(document).ready(function() { callback: function(r) { $(me).prop("disabled", false); if(r.exc) { - alert("Error, please contact support@erpnext.com"); + alert(wn._("Error, please contact support@erpnext.com")); } else { - console.log("Logged In"); + console.log(wn._("Logged In")); window.location.href = "app.html"; } } From 187ea3334fbc94b5116f706a2b297b93238f5161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Wed, 9 Oct 2013 14:53:44 -0300 Subject: [PATCH 112/135] Fix translate cart.js --- portal/templates/includes/cart.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/portal/templates/includes/cart.js b/portal/templates/includes/cart.js index bd3f56533c..a894b32e6b 100644 --- a/portal/templates/includes/cart.js +++ b/portal/templates/includes/cart.js @@ -13,11 +13,11 @@ $(document).ready(function() { $(".progress").remove(); if(r.exc) { if(r.exc.indexOf("WebsitePriceListMissingError")!==-1) { - erpnext.cart.show_error("Oops!", "Price List not configured."); + erpnext.cart.show_error("Oops!", wn._("Price List not configured.")); } else if(r["403"]) { - erpnext.cart.show_error("Hey!", "You need to be logged in to view your cart."); + erpnext.cart.show_error("Hey!", wn._("You need to be logged in to view your cart.")); } else { - erpnext.cart.show_error("Oops!", "Something went wrong."); + erpnext.cart.show_error("Oops!", wn._("Something went wrong.")); } } else { erpnext.cart.set_cart_count(); @@ -78,7 +78,7 @@ $.extend(erpnext.cart, { var no_items = $.map(doclist, function(d) { return d.item_code || null;}).length===0; if(no_items) { - erpnext.cart.show_error("Empty :-(", "Go ahead and add something to your cart."); + erpnext.cart.show_error("Empty :-(", wn._("Go ahead and add something to your cart.")); $("#cart-addresses").toggle(false); return; } @@ -117,7 +117,7 @@ $.extend(erpnext.cart, { }); if(!(addresses && addresses.length)) { - $cart_shipping_address.html('
    Hey! Go ahead and add an address
    '); + $cart_shipping_address.html('
    '+wn._("Hey! Go ahead and add an address")+'
    '); } else { erpnext.cart.render_address($cart_shipping_address, addresses, doclist[0].shipping_address_name); erpnext.cart.render_address($cart_billing_address, addresses, doclist[0].customer_address); @@ -283,7 +283,7 @@ $.extend(erpnext.cart, { $("#cart-error") .empty() - .html(msg || "Something went wrong!") + .html(msg || wn._("Something went wrong!")) .toggle(true); } else { window.location.href = "order?name=" + encodeURIComponent(r.message); From c4e70c38b667111d3dfe0280844e19b54187aa8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 14 Oct 2013 16:58:14 -0300 Subject: [PATCH 113/135] Fix translate Startup.js --- public/js/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/startup.js b/public/js/startup.js index 4b58c4cadb..3853ff11cd 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -41,7 +41,7 @@ erpnext.startup.show_expiry_banner = function() { var msg = ""; if (0 <= diff && diff <= 10) { var expiry_string = diff==0 ? "today" : repl("in %(diff)s day(s)", { diff: diff }); - msg = repl(wn._('Your ERPNext subscription will expire %(expiry_string)s. %(payment_link)s')), + msg = repl(wn._('Your ERPNext subscription will expire %(expiry_string)s. %(payment_link)s'), { expiry_string: expiry_string, payment_link: payment_link }); } else if (diff < 0) { msg = repl(wn._('This ERPNext subscription has expired. %(payment_link)s'), {payment_link: payment_link}); From 8bf1374abf239ec5e9811eab9861ecb32d3c0cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 15:22:20 -0300 Subject: [PATCH 114/135] Fix translate accounts/page/accounts_home/accounts_home.js --- accounts/page/accounts_home/accounts_home.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js index daf0206f65..7a4f511a8b 100644 --- a/accounts/page/accounts_home/accounts_home.js +++ b/accounts/page/accounts_home/accounts_home.js @@ -88,12 +88,12 @@ wn.module_page["Accounts"] = [ { "label": wn._("Period Closing Voucher"), "doctype": "Period Closing Voucher", - description: "Close Balance Sheet and book Profit or Loss." + description: wn._("Close Balance Sheet and book Profit or Loss.") }, { "page":"voucher-import-tool", "label": wn._("Voucher Import Tool"), - "description": "Import accounting entries from CSV." + "description": wn._("Import accounting entries from CSV.") }, ] }, @@ -105,7 +105,7 @@ wn.module_page["Accounts"] = [ "label": wn._("Accounts Settings"), "route": "Form/Accounts Settings", "doctype":"Accounts Settings", - "description": "Settings for Accounts" + "description": wn._("Settings for Accounts") }, { "label": wn._("Sales Taxes and Charges Master"), @@ -150,7 +150,7 @@ wn.module_page["Accounts"] = [ { "doctype":"C-Form", "label": wn._("C-Form"), - description: "C-Form records", + description: wn._("C-Form records"), country: "India" } ] From f941e7499f7b8322de5e5ec227e5d76f02eef6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 15:22:53 -0300 Subject: [PATCH 115/135] Fix translate selling/doctype/lead/lead.js --- selling/doctype/lead/lead.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js index 28507fb326..8f5057d285 100644 --- a/selling/doctype/lead/lead.js +++ b/selling/doctype/lead/lead.js @@ -24,8 +24,8 @@ erpnext.LeadController = wn.ui.form.Controller.extend({ if(in_list(user_roles,'System Manager')) { cur_frm.footer.help_area.innerHTML = '
    \ -

    Sales Email Settings
    \ - Automatically extract Leads from a mail box e.g. "sales@example.com"

    '; +

    '+wn._('Sales Email Settings')+'
    \ + '+wn._('Automatically extract Leads from a mail box e.g.')+' "sales@example.com"

    '; } }, @@ -68,7 +68,7 @@ erpnext.LeadController = wn.ui.form.Controller.extend({ order by is_primary_address, is_shipping_address desc' }, as_dict: 1, - no_results_message: 'No addresses created', + no_results_message: wn._('No addresses created'), render_row: this.render_address_row, }); // note: render_address_row is defined in contact_control.js From 1e7685e8ae67ca602221d22dd2a657cab0a4e8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 15:32:13 -0300 Subject: [PATCH 116/135] Fix translate accounts/page/financial_analytics/financial_analytics.js --- accounts/page/financial_analytics/financial_analytics.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/page/financial_analytics/financial_analytics.js b/accounts/page/financial_analytics/financial_analytics.js index 7a84dc7aef..ffe29ac1a2 100644 --- a/accounts/page/financial_analytics/financial_analytics.js +++ b/accounts/page/financial_analytics/financial_analytics.js @@ -44,11 +44,11 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ ], setup_columns: function() { var std_columns = [ - {id: "check", name: "Plot", field: "check", width: 30, + {id: "check", name: wn._("Plot"), field: "check", width: 30, formatter: this.check_formatter}, - {id: "name", name: "Account", field: "name", width: 300, + {id: "name", name: wn._("Account"), field: "name", width: 300, formatter: this.tree_formatter}, - {id: "opening", name: "Opening", field: "opening", hidden: true, + {id: "opening", name: wn._("Opening"), field: "opening", hidden: true, formatter: this.currency_formatter} ]; From ac0e261eee897a845ec82406d60dd9f7b21e35e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 15:33:54 -0300 Subject: [PATCH 117/135] Fix translate accounts/page/financial_statements/financial_statements.js --- accounts/page/financial_statements/financial_statements.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/financial_statements/financial_statements.js b/accounts/page/financial_statements/financial_statements.js index 6ea2c7d329..6a11683070 100644 --- a/accounts/page/financial_statements/financial_statements.js +++ b/accounts/page/financial_statements/financial_statements.js @@ -34,11 +34,11 @@ pscript['onload_Financial Statements'] = function(wrapper) { options: ['Loading...'] }) - wrapper.appframe.add_button("Create", function() { + wrapper.appframe.add_button(wn._("Create"), function() { pscript.stmt_new(); }, "icon-refresh") - wrapper.appframe.add_button("Print", function() { + wrapper.appframe.add_button(wn._("Print"), function() { _p.go($i('print_html').innerHTML); }, "icon-print") From 32af5cd62e01279f4be28c46d05bfc3b62c12294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 15:52:57 -0300 Subject: [PATCH 118/135] Fix translate accounts/page/general_ledger/general_ledger.js --- accounts/page/general_ledger/general_ledger.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index 25cf840645..93a23889bf 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -237,7 +237,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ closing.credit = opening.credit + totals.credit; if(me.account) { - me.appframe.set_title("General Ledger: " + me.account); + me.appframe.set_title(wn._("General Ledger: ") + me.account); // group by ledgers if(this.account_by_name[this.account].group_or_ledger==="Group" @@ -255,7 +255,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ out = [opening].concat(out).concat([totals, closing]); } else { - me.appframe.set_title("General Ledger"); + me.appframe.set_title(wn._("General Ledger")); out = out.concat([totals]); } From 54db11c3235d14109a54392cfb532dd4728a210a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 16:06:39 -0300 Subject: [PATCH 119/135] Fix translate buying/doctype/supplier_quotation/supplier_quotation.js --- buying/doctype/supplier_quotation/supplier_quotation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buying/doctype/supplier_quotation/supplier_quotation.js b/buying/doctype/supplier_quotation/supplier_quotation.js index cd6127d235..ccb903e599 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.js +++ b/buying/doctype/supplier_quotation/supplier_quotation.js @@ -15,7 +15,7 @@ erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.ext this._super(); if (this.frm.doc.docstatus === 1) { - cur_frm.add_custom_button("Make Purchase Order", this.make_purchase_order); + cur_frm.add_custom_button(wn._("Make Purchase Order"), this.make_purchase_order); } else if (this.frm.doc.docstatus===0) { cur_frm.add_custom_button(wn._('From Material Request'), From b0e466d55cc91fd9baf975b2a9a5b82f212b1557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 16:11:34 -0300 Subject: [PATCH 120/135] Fix translate buying/page/buying_home/buying_home.js --- buying/page/buying_home/buying_home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buying/page/buying_home/buying_home.js b/buying/page/buying_home/buying_home.js index 5db57f4f02..1e08a3bbf3 100644 --- a/buying/page/buying_home/buying_home.js +++ b/buying/page/buying_home/buying_home.js @@ -58,7 +58,7 @@ wn.module_page["Buying"] = [ "label": wn._("Buying Settings"), "route": "Form/Buying Settings", "doctype":"Buying Settings", - "description": "Settings for Buying Module" + "description": wn._("Settings for Buying Module") }, { "label": wn._("Purchase Taxes and Charges Master"), From 21fc1f26529de5af8a202da34fe46c7b3a25ceaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 16:18:18 -0300 Subject: [PATCH 121/135] Fix translate buying/page/purchase_analytics/purchase_analytics.js --- .../purchase_analytics/purchase_analytics.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/buying/page/purchase_analytics/purchase_analytics.js b/buying/page/purchase_analytics/purchase_analytics.js index c163052a6a..6a8fc1ae0f 100644 --- a/buying/page/purchase_analytics/purchase_analytics.js +++ b/buying/page/purchase_analytics/purchase_analytics.js @@ -4,7 +4,7 @@ wn.pages['purchase-analytics'].onload = function(wrapper) { wn.ui.make_app_page({ parent: wrapper, - title: 'Purchase Analytics', + title: wn._('Purchase Analytics'), single_column: true }); @@ -18,7 +18,7 @@ wn.pages['purchase-analytics'].onload = function(wrapper) { erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ init: function(wrapper) { this._super({ - title: "Purchase Analytics", + title: wn._("Purchase Analytics"), page: wrapper, parent: $(wrapper).find('.layout-main'), appframe: wrapper.appframe, @@ -31,7 +31,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ this.tree_grids = { "Supplier Type": { - label: "Supplier Type / Supplier", + label: wn._("Supplier Type / Supplier"), show: true, item_key: "supplier", parent_field: "parent_supplier_type", @@ -44,7 +44,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ } }, "Supplier": { - label: "Supplier", + label: wn._("Supplier"), show: false, item_key: "supplier", formatter: function(item) { @@ -74,7 +74,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ this.tree_grid = this.tree_grids[this.tree_type]; var std_columns = [ - {id: "check", name: "Plot", field: "check", width: 30, + {id: "check", name: wn._("Plot"), field: "check", width: 30, formatter: this.check_formatter}, {id: "name", name: this.tree_grid.label, field: "name", width: 300, formatter: this.tree_formatter}, @@ -86,23 +86,23 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ this.columns = std_columns.concat(this.columns); }, filters: [ - {fieldtype:"Select", label: "Tree Type", options:["Supplier Type", "Supplier", + {fieldtype:"Select", label: wn._("Tree Type"), options:["Supplier Type", "Supplier", "Item Group", "Item"], filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }}, - {fieldtype:"Select", label: "Based On", options:["Purchase Invoice", + {fieldtype:"Select", label: wn._("Based On"), options:["Purchase Invoice", "Purchase Order", "Purchase Receipt"]}, - {fieldtype:"Select", label: "Value or Qty", options:["Value", "Quantity"]}, - {fieldtype:"Select", label: "Company", link:"Company", + {fieldtype:"Select", label: wn._("Value or Qty"), options:["Value", "Quantity"]}, + {fieldtype:"Select", label: wn._("Company"), link:"Company", default_value: "Select Company..."}, - {fieldtype:"Date", label: "From Date"}, - {fieldtype:"Label", label: "To"}, - {fieldtype:"Date", label: "To Date"}, - {fieldtype:"Select", label: "Range", + {fieldtype:"Date", label: wn._("From Date")}, + {fieldtype:"Label", label: wn._("To")}, + {fieldtype:"Date", label: wn._("To Date")}, + {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", label: "Reset Filters"} + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { var me = this; @@ -130,18 +130,18 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ }) wn.report_dump.data["Supplier Type"] = [{ - name: "All Supplier Types", + name: wn._("All Supplier Types"), id: "All Supplier Types", }].concat(wn.report_dump.data["Supplier Type"]); wn.report_dump.data["Supplier"].push({ - name: "Not Set", + name: wn._("Not Set"), parent_supplier_type: "All Supplier Types", id: "Not Set", }); wn.report_dump.data["Item"].push({ - name: "Not Set", + name: wn._("Not Set"), parent_item_group: "All Item Groups", id: "Not Set", }); From eb65e210fdda15eb6f35dc79bacfc53c4b8832c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 16:31:58 -0300 Subject: [PATCH 122/135] Fix translate hr/doctype/upload_attendance/upload_attendance.js --- hr/doctype/upload_attendance/upload_attendance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/doctype/upload_attendance/upload_attendance.js b/hr/doctype/upload_attendance/upload_attendance.js index bf584a00fc..06a78c6735 100644 --- a/hr/doctype/upload_attendance/upload_attendance.js +++ b/hr/doctype/upload_attendance/upload_attendance.js @@ -56,10 +56,10 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({ return v; }); - r.messages = ["

    "+wn._("Import Failed!"+"

    "] + r.messages = ["

    "+wn._("Import Failed!")+"

    "] .concat(r.messages) } else { - r.messages = ["

    "+wn._("Import Successful!"+"

    "]. + r.messages = ["

    "+wn._("Import Successful!")+"

    "]. concat(r.message.messages) } From 17a37bd329def05900e0e1cb2ea24f12cd63f90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 16:50:53 -0300 Subject: [PATCH 123/135] Fix translate hr/doctype/job_applicant/job_applicant.js --- hr/doctype/job_applicant/job_applicant.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/doctype/job_applicant/job_applicant.js b/hr/doctype/job_applicant/job_applicant.js index f82da11f07..ccfbbc25b9 100644 --- a/hr/doctype/job_applicant/job_applicant.js +++ b/hr/doctype/job_applicant/job_applicant.js @@ -7,8 +7,8 @@ cur_frm.cscript = { onload: function(doc, dt, dn) { if(in_list(user_roles,'System Manager')) { cur_frm.footer.help_area.innerHTML = '
    \ -

    Jobs Email Settings
    \ - Automatically extract Job Applicants from a mail box e.g. "jobs@example.com"

    '; +

    '+wn._("Jobs Email Settings")+'
    \ + '+wn._('Automatically extract Job Applicants from a mail box ')+'e.g. "jobs@example.com"

    '; } }, refresh: function(doc) { From 79341409693a1ac5e73cfa78b3f2b9c1912e05e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 17:14:28 -0300 Subject: [PATCH 124/135] Fix translate projects/report/daily_time_log_summary/daily_time_log_summary.js --- .../report/daily_time_log_summary/daily_time_log_summary.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.js b/projects/report/daily_time_log_summary/daily_time_log_summary.js index 6bb1117ba6..70e3cca450 100644 --- a/projects/report/daily_time_log_summary/daily_time_log_summary.js +++ b/projects/report/daily_time_log_summary/daily_time_log_summary.js @@ -5,13 +5,13 @@ wn.query_reports["Daily Time Log Summary"] = { "filters": [ { "fieldname":"from_date", - "label": "From Date", + "label": wn._("From Date"), "fieldtype": "Date", "default": wn.datetime.get_today() }, { "fieldname":"to_date", - "label": "To Date", + "label": wn._("To Date"), "fieldtype": "Date", "default": wn.datetime.get_today() }, From a1a8907e78e952fcc363252d6b60f7186cfc7a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 17:27:26 -0300 Subject: [PATCH 125/135] Fix translate startup.js --- public/js/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/startup.js b/public/js/startup.js index 3853ff11cd..7d5792afb5 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -44,7 +44,7 @@ erpnext.startup.show_expiry_banner = function() { msg = repl(wn._('Your ERPNext subscription will expire %(expiry_string)s. %(payment_link)s'), { expiry_string: expiry_string, payment_link: payment_link }); } else if (diff < 0) { - msg = repl(wn._('This ERPNext subscription has expired. %(payment_link)s'), {payment_link: payment_link}); + msg = repl(wn._('This ERPNext subscription')+''+wn._('has expired')+'. %(payment_link)s'), {payment_link: payment_link}); } if(msg) wn.ui.toolbar.show_banner(msg); From acc7061ca70430e469c775f949870f9a9f8e6fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 17:29:57 -0300 Subject: [PATCH 126/135] Fix translate public/js/controllers/stock_controller.js --- public/js/controllers/stock_controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/controllers/stock_controller.js b/public/js/controllers/stock_controller.js index e4b03191a1..6fe3815555 100644 --- a/public/js/controllers/stock_controller.js +++ b/public/js/controllers/stock_controller.js @@ -7,7 +7,7 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({ show_stock_ledger: function() { var me = this; if(this.frm.doc.docstatus===1) { - this.frm.add_custom_button("Stock Ledger", function() { + this.frm.add_custom_button(wn._("Stock Ledger"), function() { wn.route_options = { voucher_no: me.frm.doc.name, from_date: me.frm.doc.posting_date, @@ -21,7 +21,7 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({ show_general_ledger: function() { var me = this; if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_accounting_for_stock"))) { - cur_frm.add_custom_button('Accounting Ledger', function() { + cur_frm.add_custom_button(wn._('Accounting Ledger'), function() { wn.route_options = { "voucher_no": me.frm.doc.name, "from_date": me.frm.doc.posting_date, From 7329d7f118793621ce3b789beeee1ac67b697d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 17:54:25 -0300 Subject: [PATCH 127/135] Fix translate selling/doctype/sales_bom/sales_bom.js --- selling/doctype/sales_bom/sales_bom.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selling/doctype/sales_bom/sales_bom.js b/selling/doctype/sales_bom/sales_bom.js index 921d9d6683..871420abbe 100644 --- a/selling/doctype/sales_bom/sales_bom.js +++ b/selling/doctype/sales_bom/sales_bom.js @@ -15,8 +15,8 @@ cur_frm.fields_dict.new_item_code.get_query = function() { query: "selling.doctype.sales_bom.sales_bom.get_new_item_code" } } -cur_frm.fields_dict.new_item_code.query_description = wn._('Select Item where "Is Stock Item" is "No"')+ wn._('\ - and "Is Sales Item" is "Yes" and there is no other Sales BOM'); +cur_frm.fields_dict.new_item_code.query_description = wn._('Select Item where "Is Stock Item" is "No"')+ +wn._('and "Is Sales Item" is "Yes" and there is no other Sales BOM'); cur_frm.cscript.item_code = function(doc, dt, dn) { var d = locals[dt][dn]; From 9d6312fac4c933e9d1571642c5ef169ea38a9e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 17:57:20 -0300 Subject: [PATCH 128/135] Fix translate customers_not_buying_since_long_time.js --- .../customers_not_buying_since_long_time.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js index d527b344b8..78c38286c2 100644 --- a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +++ b/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js @@ -5,7 +5,7 @@ wn.query_reports["Customers Not Buying Since Long Time"] = { "filters": [ { "fieldname":"days_since_last_order", - "label": "Days Since Last Order", + "label": wn._("Days Since Last Order"), "fieldtype": "Int", "default": 60 } From 119326826a9482cd654c4eb6359845ba88751a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 18:14:50 -0300 Subject: [PATCH 129/135] Fix translate setup/doctype/territory/territory.js --- setup/doctype/territory/territory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/territory/territory.js b/setup/doctype/territory/territory.js index 7561816185..de708b6d05 100644 --- a/setup/doctype/territory/territory.js +++ b/setup/doctype/territory/territory.js @@ -9,7 +9,7 @@ cur_frm.cscript.set_root_readonly = function(doc) { // read-only for root territory if(!doc.parent_territory) { cur_frm.perm = [[1,0,0], [1,0,0]]; - cur_frm.set_intro("This is a root territory and cannot be edited."); + cur_frm.set_intro(wn._("This is a root territory and cannot be edited.")); } else { cur_frm.set_intro(null); } From 058e246be68e1a15e8efb59da260a68518089877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 18:15:29 -0300 Subject: [PATCH 130/135] Fix translate supplier_type.js --- setup/doctype/supplier_type/supplier_type.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/supplier_type/supplier_type.js b/setup/doctype/supplier_type/supplier_type.js index b65f67c21c..5ebf6d51e2 100644 --- a/setup/doctype/supplier_type/supplier_type.js +++ b/setup/doctype/supplier_type/supplier_type.js @@ -2,5 +2,5 @@ // License: GNU General Public License v3. See license.txt cur_frm.cscript.refresh = function(doc) { - cur_frm.set_intro(doc.__islocal ? "" : "There is nothing to edit.") + cur_frm.set_intro(doc.__islocal ? "" : wn._("There is nothing to edit.")) } \ No newline at end of file From b7a6b850cfe324d22cbf49ba1b21c7b487e7eff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 18:20:32 -0300 Subject: [PATCH 131/135] Fix translate setup.js --- setup/page/setup/setup.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index f39618685d..0127a2a3f0 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -5,12 +5,12 @@ wn.pages['Setup'].onload = function(wrapper) { if(msg_dialog && msg_dialog.display) msg_dialog.hide(); wn.ui.make_app_page({ parent: wrapper, - title: 'Setup', + title: wn._('Setup'), single_column: true }); wrapper.appframe.add_module_icon("Setup"); - wrapper.appframe.add_button("Refresh", function() { + wrapper.appframe.add_button(wn._("Refresh"), function() { wn.pages.Setup.make(wrapper); }, "icon-refresh"); @@ -110,7 +110,7 @@ wn.pages.Setup.make = function(wrapper) { }) } else if(item.single) { - $(' Edit') + $(''+wn._('Edit')+'') .appendTo($links) $links.find(".view-link") @@ -119,11 +119,11 @@ wn.pages.Setup.make = function(wrapper) { wn.set_route("Form", $(this).attr("data-doctype")); }) } else if(item.type !== "Link"){ - $(' New \ + $(''+wn._('New')+' \ | \ - View \ + '+wn._('View')+' \ | \ - Import') + '+wn._('Import')+'') .appendTo($links) $links.find(".view-link") @@ -180,11 +180,11 @@ wn.pages.Setup.make = function(wrapper) { if(r.message) { body.empty(); if(wn.boot.expires_on) { - $(body).prepend("
    Account expires on " + $(body).prepend("
    "+wn.("Account expires on") + wn.datetime.global_date_format(wn.boot.expires_on) + "
    "); } - $completed = $('

    Setup Completed

    \ + $completed = $('

    '+wn._("Setup Completed")+'

    \
    ') .appendTo(body); From f007dd4e5f40e993141cca6626a5232303d8c172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 18:32:38 -0300 Subject: [PATCH 132/135] Fix translate stock/page/stock_ageing/stock_ageing.js --- stock/page/stock_ageing/stock_ageing.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index 98f7ace40f..914999b205 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -30,21 +30,21 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({ }, setup_columns: function() { this.columns = [ - {id: "name", name: "Item", field: "name", width: 300, + {id: "name", name: wn._("Item"), field: "name", width: 300, link_formatter: { open_btn: true, doctype: '"Item"' }}, - {id: "item_name", name: "Item Name", field: "item_name", + {id: "item_name", name: wn._("Item Name"), field: "item_name", width: 100, formatter: this.text_formatter}, - {id: "description", name: "Description", field: "description", + {id: "description", name: wn._("Description"), field: "description", width: 200, formatter: this.text_formatter}, - {id: "brand", name: "Brand", field: "brand", width: 100}, - {id: "average_age", name: "Average Age", field: "average_age", + {id: "brand", name: wn._("Brand"), field: "brand", width: 100}, + {id: "average_age", name: wn._("Average Age"), field: "average_age", formatter: this.currency_formatter}, - {id: "earliest", name: "Earliest", field: "earliest", + {id: "earliest", name: wn._("Earliest"), field: "earliest", formatter: this.currency_formatter}, - {id: "latest", name: "Latest", field: "latest", + {id: "latest", name: wn._("Latest"), field: "latest", formatter: this.currency_formatter}, {id: "stock_uom", name: "UOM", field: "stock_uom", width: 100}, ]; From 3da50f09609d12385134663db77cfc237cabc2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Tue, 15 Oct 2013 18:34:18 -0300 Subject: [PATCH 133/135] Fix translate stock/page/stock_home/stock_home.js --- stock/page/stock_home/stock_home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index 63db6086ab..e99c1fccd0 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -106,7 +106,7 @@ wn.module_page["Stock"] = [ "label": wn._("Stock Settings"), "route": "Form/Stock Settings", "doctype":"Stock Settings", - "description": "Settings for Stock Module" + "description": wn._("Settings for Stock Module") }, { "route":"Sales Browser/Item Group", From a137e8cf0320ac22996ca9f7cb58690e3f1e5062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Fri, 18 Oct 2013 14:25:29 -0300 Subject: [PATCH 134/135] Fix translate setup/doctype/company/company.js --- setup/doctype/company/company.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/company/company.js b/setup/doctype/company/company.js index 2f1d6624f4..217cf86567 100644 --- a/setup/doctype/company/company.js +++ b/setup/doctype/company/company.js @@ -31,7 +31,7 @@ cur_frm.cscript.company_name = function(doc){ cur_frm.cscript.abbr = function(doc){ if(doc.abbr && cur_frm.cscript.has_special_chars(doc.abbr)){ - msgprint(""wn._("Special Characters ")+"! @ # $ % ^ * + = - [ ] ' ; , / { } | : < > ?" + + msgprint(""+wn._("Special Characters ")+"! @ # $ % ^ * + = - [ ] ' ; , / { } | : < > ?" + wn._("are not allowed for")+ "\nAbbr " + doc.abbr +"") doc.abbr = ''; refresh_field('abbr'); From 8833c52c025baf246d2b22e0d836f8c8182d51d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20Perretti?= Date: Mon, 21 Oct 2013 17:39:37 -0200 Subject: [PATCH 135/135] Fix translate public/js/startup.js --- public/js/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/startup.js b/public/js/startup.js index 76b7714887..ecb23dae78 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -26,7 +26,7 @@ erpnext.startup.show_expiry_banner = function() { var msg = ""; if (0 <= diff && diff <= 10) { var expiry_string = diff==0 ? "today" : repl("in %(diff)s day(s)", { diff: diff }); - msg = repl(wn._('Your ERPNext subscription will expire %(expiry_string)s. %(payment_link)s'), + msg = repl(wn._('Your ERPNext subscription will')+'expire %(expiry_string)s. %(payment_link)s', { expiry_string: expiry_string, payment_link: payment_link }); } else if (diff < 0) { msg = repl(wn._('This ERPNext subscription')+''+wn._('has expired')+'. %(payment_link)s'), {payment_link: payment_link});