From 3155aff58b4a5c110a18e2d587c9b640ca5b5912 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 10 Mar 2015 18:35:20 +0530 Subject: [PATCH] [cache] website cache by language --- frappe/website/context.py | 2 +- frappe/website/render.py | 4 ++-- frappe/website/router.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/website/context.py b/frappe/website/context.py index ef11aae45b..906c8ba391 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -11,7 +11,7 @@ from frappe.website.utils import can_cache def get_context(path): context = None - cache_key = "page_context:{}".format(path) + cache_key = "page_context:{0}:{1}".format(path, frappe.local.lang) def add_data_path(context): if not context.data: diff --git a/frappe/website/render.py b/frappe/website/render.py index e8c6133ece..9b6cdfc4e7 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -99,7 +99,7 @@ def build_response(path, data, http_status_code, headers=None): def render_page(path): """get page html""" - cache_key = ("page_context:{}" if is_ajax() else "page:{}").format(path) + cache_key = ("page_context:{0}:{1}" if is_ajax() else "page:{0}:{1}").format(path, frappe.local.lang) out = None @@ -144,7 +144,7 @@ def build_page(path): html = scrub_relative_urls(html) if can_cache(context.no_cache): - frappe.cache().set_value("page:" + path, html) + frappe.cache().set_value("page:{0}:{1}".format(path, frappe.local.lang), html) return html diff --git a/frappe/website/router.py b/frappe/website/router.py index af14e52c8c..22e3ff84a1 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -9,7 +9,7 @@ from frappe.model.document import get_controller def get_route_info(path): sitemap_options = None - cache_key = "sitemap_options:{}".format(path) + cache_key = "sitemap_options:{0}:{1}".format(path, frappe.local.lang) if can_cache(): sitemap_options = frappe.cache().get_value(cache_key)