oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev3503, Ignore invalid site translation files

Browse source
This commit is contained in:
shortcutme 2018-07-05 01:59:10 +02:00
parent d4a25230ec
commit 8bdc61ddcc
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/TranslateSite/TranslateSitePlugin.py
View file

@ -58,11 +58,14 @@ class UiRequestPlugin(object):
# if site.content_manager.contents["content.json"]["files"].get(lang_file): # if site.content_manager.contents["content.json"]["files"].get(lang_file):
site.needFile(lang_file, priority=10) site.needFile(lang_file, priority=10)
if inner_path.endswith("js"): try:
data = translate.translateData(data, site.storage.loadJson(lang_file), "js") if inner_path.endswith("js"):
else: data = translate.translateData(data, site.storage.loadJson(lang_file), "js")
data = translate.translateData(data, site.storage.loadJson(lang_file), "html") else:
data = data.replace("lang={lang}", "lang=" + str(translate.lang)) # lang get parameter to .js file to avoid cache data = translate.translateData(data, site.storage.loadJson(lang_file), "html")
data = data.replace("lang={lang}", "lang=" + str(translate.lang)) # 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))
self.log.debug("Patched %s (%s bytes) in %.3fs" % (inner_path, len(data), time.time() - s)) self.log.debug("Patched %s (%s bytes) in %.3fs" % (inner_path, len(data), time.time() - s))
yield data yield data

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.3" self.version = "0.6.3"
self.rev = 3502 self.rev = 3503
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"