Merge pull request #835 from 81552433qqcom/d1

translation fix in translate.py

frappe/public/js/frappe/form/save.js

@@ -74,7 +74,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 
 					if(df.reqd && !frappe.model.has_value(doc.doctype, doc.name, df.fieldname)) {
 						has_errors = true;
-						error_fields[error_fields.length] = df.label;
+						error_fields[error_fields.length] = __(df.label);
 
 						// scroll to field
 						if(!me.scroll_set) {
@@ -91,8 +91,8 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 			});
 			if(error_fields.length)
 				msgprint(__('Mandatory fields required in {0}', [(doc.parenttype
-					? (frappe.meta.docfield_map[doc.parenttype][doc.parentfield].label + ' (Table)')
-					: doc.doctype)]) + '\n' + error_fields.join('\n'));
+					? (__(frappe.meta.docfield_map[doc.parenttype][doc.parentfield].label) + ' ('+ __("Table") + ')')
+					: __(doc.doctype))]) + '\n' + error_fields.join('\n'));
 		});
 
 		return !has_errors;

frappe/public/js/frappe/views/ganttview.js

@@ -44,7 +44,7 @@ frappe.views.Gantt = Class.extend({
 		this.appframe.add_module_icon(module)
 		this.appframe.set_views_for(this.doctype, "gantt");
 
-		this.appframe.set_title_right("Refresh",
+		this.appframe.set_title_right(__("Refresh"),
 			function() { me.refresh(); }, "icon-refresh")
 
 		this.appframe.add_field({fieldtype:"Date", label:"From",

frappe/public/js/frappe/views/query_report.js

@@ -50,7 +50,7 @@ frappe.views.QueryReport = Class.extend({
 			<p class="text-muted"><br>\
 				'+__('For comparative filters, start with')+' ">" or "<", e.g. >5 or >01-02-2012\
 				<br>'+__('For ranges')+' ('+__('values and dates')+') use ":", \
-					e.g. "5:10" (to filter values between 5 & 10)</p>\
+					e.g. "5:10"  (' + __("to filter values between 5 & 10") + ')</p>\
 		</div>').appendTo(this.wrapper);
 
 		this.make_toolbar();

frappe/translate.py

@@ -240,6 +240,7 @@ def get_messages_from_page_or_report(doctype, name, module=None):
 	file_path = frappe.get_module_path(module, doctype, name, name)
 	messages = get_messages_from_file(file_path + ".js")
 	messages += get_messages_from_file(file_path + ".html")
+	messages += get_messages_from_file(file_path + ".py")
 
 	return clean(messages)