From fd7f724e2b7e076f23d2c15e6fae8e20a5b57c0f Mon Sep 17 00:00:00 2001 From: ValdikSS Date: Mon, 22 Apr 2019 01:14:08 +0300 Subject: [PATCH] Always translate html files to avoid compatibility problems with brackets in url Backport of commit 90fee9788dc7e0e5465dc035c61b1c8417f674f0 from py3 branch --- plugins/TranslateSite/TranslateSitePlugin.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/TranslateSite/TranslateSitePlugin.py b/plugins/TranslateSite/TranslateSitePlugin.py index 6eefbb77..e049b692 100644 --- a/plugins/TranslateSite/TranslateSitePlugin.py +++ b/plugins/TranslateSite/TranslateSitePlugin.py @@ -7,11 +7,18 @@ from Translate import translate @PluginManager.registerTo("UiRequest") class UiRequestPlugin(object): def actionSiteMedia(self, path, **kwargs): - file_name = path.split("/")[-1] + file_name = path.split("/")[-1].lower() if not file_name: # Path ends with / file_name = "index.html" extension = file_name.split(".")[-1] - if translate.lang != "en" and extension in ["js", "html"]: + if extension == "html": + should_translate = True + elif extension == "js" and translate.lang != "en": + should_translate = True + else: + should_translate = False + + if should_translate: path_parts = self.parsePath(path) kwargs["header_length"] = False file_generator = super(UiRequestPlugin, self).actionSiteMedia(path, **kwargs)