From b96543df037a7c9648fdd81a9d606911d6784a49 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 26 Feb 2014 16:44:11 +0530 Subject: [PATCH] allow to set base_template via hooks --- frappe/templates/base.html | 3 +-- frappe/translate.py | 24 +----------------------- frappe/website/sitemap.py | 4 +++- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 461c3b0f7e..e42032b079 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -9,7 +9,7 @@ - + {%- block head_include %}{% endblock -%} {%- block head -%} {%- if meta_description is defined %} @@ -40,7 +40,6 @@ {%- if script_lib is defined -%}{{ script_lib }}{%- endif -%} {%- endblock -%} - {%- endblock -%} diff --git a/frappe/translate.py b/frappe/translate.py index 98b32b3c11..783d20d45c 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -267,26 +267,4 @@ def update_translations(lang, untranslated_file, translated_file): for app in frappe.get_all_apps(True): write_translations_file(app, lang, full_dict) - -def google_translate(lang, untranslated): - import requests - if untranslated: - response = requests.get("""https://www.googleapis.com/language/translate/v2""", - params = { - "key": frappe.conf.google_api_key, - "source": "en", - "target": lang, - "q": "\n".join(untranslated) - }) - - data = response.json() - - if "error" in data: - print data - - translated = data["data"]["translations"][0]["translatedText"] - if translated: - return dict(zip(untranslated, translated)) - else: - print "unable to translate" - return {} + \ No newline at end of file diff --git a/frappe/website/sitemap.py b/frappe/website/sitemap.py index b86ee18afe..6dd71b9504 100644 --- a/frappe/website/sitemap.py +++ b/frappe/website/sitemap.py @@ -56,6 +56,8 @@ def build_sitemap_options(path): # determine templates to be used if not sitemap_options.base_template_path: - sitemap_options.base_template_path = "templates/base.html" + app_base = frappe.get_hooks("base_template") + print app_base + sitemap_options.base_template_path = app_base[0] if app_base else "templates/base.html" return sitemap_options