From a620bf2174d30403b77ac4b1309929c7cfd44a30 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 18 Mar 2019 01:06:45 +0100 Subject: [PATCH] Fix lang html variable on config page --- plugins/TranslateSite/TranslateSitePlugin.py | 1 - src/Translate/Translate.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/TranslateSite/TranslateSitePlugin.py b/plugins/TranslateSite/TranslateSitePlugin.py index 67d7ffc3..326d5add 100644 --- a/plugins/TranslateSite/TranslateSitePlugin.py +++ b/plugins/TranslateSite/TranslateSitePlugin.py @@ -63,7 +63,6 @@ class UiRequestPlugin(object): data = translate.translateData(data, site.storage.loadJson(lang_file), "js") else: data = translate.translateData(data, site.storage.loadJson(lang_file), "html") - data = data.replace(b"lang={lang}", b"lang=%s" % translate.lang.encode("utf8")) # lang get parameter to .js file to avoid cache except Exception as err: site.log.error("Error loading translation file %s: %s" % (lang_file, err)) diff --git a/src/Translate/Translate.py b/src/Translate/Translate.py index f26c1044..4163d333 100644 --- a/src/Translate/Translate.py +++ b/src/Translate/Translate.py @@ -126,6 +126,10 @@ class Translate(dict): else: pattern = '"(' + "|".join(patterns) + ')"' data = re.sub(pattern, replacer, data) + + if mode == "html": + data = data.replace("lang={lang}", "lang=%s" % self.lang) # lang get parameter to .js file to avoid cache + return data translate = Translate()