diff --git a/frappe/core/doctype/page/page.py b/frappe/core/doctype/page/page.py index a9c2e1ddbb..3227e7f9b8 100644 --- a/frappe/core/doctype/page/page.py +++ b/frappe/core/doctype/page/page.py @@ -71,19 +71,19 @@ class Page(Document): fpath = os.path.join(path, scrub(self.name) + '.js') if os.path.exists(fpath): with open(fpath, 'r') as f: - self.script = f.read() + self.script = unicode(f.read(), "utf-8") # css fpath = os.path.join(path, scrub(self.name) + '.css') if os.path.exists(fpath): with open(fpath, 'r') as f: - self.style = f.read() + self.style = unicode(f.read(), "utf-8") # html fpath = os.path.join(path, scrub(self.name) + '.html') if os.path.exists(fpath): with open(fpath, 'r') as f: - self.content = f.read() + self.content = unicode(f.read(), "utf-8") if frappe.lang != 'en': from frappe.translate import get_lang_js diff --git a/frappe/templates/emails/standard.html b/frappe/templates/emails/standard.html index aabe51d5ce..c496f167dd 100644 --- a/frappe/templates/emails/standard.html +++ b/frappe/templates/emails/standard.html @@ -5,15 +5,15 @@