[added patch]

frappe/__init__.py

@@ -43,7 +43,7 @@ def _(msg, lang=None):
 	if not lang:
 		lang = local.lang
 
-	if local.lang == "en":
+	if lang == "en":
 		return msg
 
 	from frappe.translate import get_full_dict

frappe/core/doctype/page/page.py

@@ -85,16 +85,18 @@ class Page(Document):
 		from frappe.modules import get_module_path, scrub
 		import os
 
-		path = os.path.join(get_module_path(self.module), 'page', scrub(self.name))
+		page_name = scrub(self.name)
+
+		path = os.path.join(get_module_path(self.module), 'page', page_name)
 
 		# script
-		fpath = os.path.join(path, scrub(self.name) + '.js')
+		fpath = os.path.join(path, page_name + '.js')
 		if os.path.exists(fpath):
 			with open(fpath, 'r') as f:
 				self.script = unicode(f.read(), "utf-8")
 
 		# css
-		fpath = os.path.join(path, scrub(self.name) + '.css')
+		fpath = os.path.join(path, page_name + '.css')
 		if os.path.exists(fpath):
 			with open(fpath, 'r') as f:
 				self.style = unicode(f.read(), "utf-8")
@@ -109,3 +111,5 @@ class Page(Document):
 		if frappe.lang != 'en':
 			from frappe.translate import get_lang_js
 			self.script += get_lang_js("page", self.name)
+
+

frappe/patches.txt

@@ -91,3 +91,4 @@ frappe.patches.v6_0.document_type_rename
 frappe.patches.v6_0.fix_ghana_currency
 frappe.patches.v6_2.ignore_user_permissions_if_missing
 execute:frappe.db.sql("delete from tabSessions where user is null")
+frappe.patches.v6_1.rename_file_data

frappe/patches/v6_1/rename_file_data.py

@@ -7,10 +7,6 @@ def execute():
 		frappe.rename_doc("DocType", "File Data", "File")
 		frappe.reload_doctype("File")
 
-	# TODO: DELETE THIS
-	frappe.db.sql("""delete from tabFile where is_folder=1""")
-	frappe.db.sql("""update tabFile set folder=null""")
-
 	if not frappe.db.exists("File", {"is_home_folder": 1}):
 		make_home_folder()
 

frappe/public/js/frappe/list/doclistview.js

@@ -244,9 +244,6 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
 	},
 
 	refresh: function(dirty) {
-		if(window.ttt) throw "here";
-
-
 		if(dirty!==undefined) this.dirty = dirty;
 		this.init_stats();